Remove Calamari-related pieces

...with the exception of the purge operation, since
removing Calamari would still be useful for an old
cluster.

Signed-off-by: John Spray <john.spray@redhat.com>
pull/3147/head
John Spray 2018-09-21 11:00:18 +01:00
parent bd82c380c4
commit 26bfef4107
4 changed files with 0 additions and 46 deletions

View File

@ -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 #

View File

@ -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 #

View File

@ -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

View File

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