ansible: Support non-default cluster name

Signed-off-by: Boris Ranto <branto@redhat.com>

diff --git a/ansible/group_vars/all.yml.sample b/ansible/group_vars/all.yml.sample
index 11820ed55a34d39336e71591df4ad1ecb3c9d65a..0358916856b9173657b22cf0e03ca2817162913d 100644 (file)
--- a/ansible/group_vars/all.yml.sample
+++ b/ansible/group_vars/all.yml.sample
@@ -1,5 +1,7 @@
 dummy:
 
+#cluster_name: ceph
+
 #containerized: true
 
 # Set the backend options, mgr+prometheus or cephmetrics+graphite

diff --git a/ansible/roles/ceph-mgr/tasks/main.yml b/ansible/roles/ceph-mgr/tasks/main.yml
index 0a3617f430fadc9a88efabeaecad7fb45ef19b11..172ed7d8056146b8ff75ff7fb20dbab3455ea03f 100644 (file)
--- a/ansible/roles/ceph-mgr/tasks/main.yml
+++ b/ansible/roles/ceph-mgr/tasks/main.yml
@@ -25,4 +25,4 @@
   when: container_name != ""
 
 - name: Enable mgr prometheus module
-  command: "{{ mgr_prefix|default('') }} ceph mgr module enable prometheus"
+  command: "{{ mgr_prefix|default('') }} ceph --cluster {{ cluster_name }} mgr module enable prometheus"

diff --git a/ansible/roles/cephmetrics-common/defaults/main.yml b/ansible/roles/cephmetrics-common/defaults/main.yml
index a7266b686eb8e6205326be156beca6994c76104e..10f7d8b82a133e30ae8c4499b6abba18f635aa5f 100644 (file)
--- a/ansible/roles/cephmetrics-common/defaults/main.yml
+++ b/ansible/roles/cephmetrics-common/defaults/main.yml
@@ -1,5 +1,6 @@
 ---
 defaults:
+  cluster_name: ceph
   containerized: true
   backend:
     metrics: mgr  # mgr, cephmetrics