Merge branch 'jcsp-wip-rm-calamari'

group_vars/mons.yml.sample

@@ -31,12 +31,6 @@ dummy:
 #  - nodelete
 #  - nosizechange
 
-# Enable the Calamari-backed REST API on a Monitor
-#calamari: false
-
-# Enable debugging for Calamari
-#calamari_debug: false
-
 
 ###############
 # CRUSH RULES #

roles/ceph-mon/defaults/main.yml

@@ -23,12 +23,6 @@ secure_cluster_flags:
   - nodelete
   - nosizechange
 
-# Enable the Calamari-backed REST API on a Monitor
-calamari: false
-
-# Enable debugging for Calamari
-calamari_debug: false
-
 
 ###############
 # CRUSH RULES #

roles/ceph-mon/tasks/calamari.yml

@@ -1,30 +0,0 @@
----
-- name: test if calamari-server is installed
-  command: rpm -q --qf "%{VERSION}\n" calamari-server
-  args:
-    warn: no
-  ignore_errors: true
-  check_mode: no
-  changed_when: false
-  register: calamari_server_rpm_state
-
-- name: install calamari server
-  package:
-    name: calamari-server
-    state: "{{ 'latest' if (calamari_server_rpm_state.stdout.split('.')[0] is version(ceph_rhcs_version, '<') and not calamari_server_rpm_state.failed) else (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  tags:
-    - package-install
-
-- name: increase calamari logging level when debug is on
-  ini_file:
-    dest: /etc/calamari/calamari.conf
-    section: "{{ item }}"
-    option: log_level
-    value: DEBUG
-  with_items:
-    - cthulhu
-    - calamari_web
-  when: calamari_debug
-
-- name: initialize the calamari server api
-  command: calamari-ctl initialize

roles/ceph-mon/tasks/main.yml

@@ -36,7 +36,3 @@
 
 - name: include set_osd_pool_default_pg_num.yml
   include_tasks: set_osd_pool_default_pg_num.yml
-
-- name: include calamari.yml
-  include_tasks: calamari.yml
-  when: calamari