commit c2be93b276f4df540bd74fa97ae2f0d987a2c784
author Jiri Broulik <jbroulik@mirantis.com> Tue Oct 03 14:20:00 2017 +0200
committer Jiri Broulik <jbroulik@mirantis.com> Fri Oct 06 11:29:50 2017 +0200
tree 8cf92ae9364ead0e5f850842f3841bcf66b51a0f
parent db41a13d398e574d5e1d75505c5d8ddf9ec25596

grains / crush / auto generate keyrings

Change-Id: I380d2d0dad799da0b1cc55b16517402b60421a30

metadata/service/common/cluster.yml

diff --git a/metadata/service/common/cluster.yml b/metadata/service/common/cluster.yml
index 9e729fe..2358610 100644
--- a/metadata/service/common/cluster.yml
+++ b/metadata/service/common/cluster.yml
@@ -15,11 +15,3 @@
           host: ${_param:ceph_mon_node02_address}
         - name: ${_param:ceph_mon_node03_hostname}
           host: ${_param:ceph_mon_node03_address}
-      keyring:
-        admin:
-          key: ${_param:ceph_admin_keyring}
-          caps:
-            mds: "allow *"
-            mgr: "allow *"
-            mon: "allow *"
-            osd: "allow *"

metadata/service/mon/cluster.yml

diff --git a/metadata/service/mon/cluster.yml b/metadata/service/mon/cluster.yml
index 6639484..6a10da2 100644
--- a/metadata/service/mon/cluster.yml
+++ b/metadata/service/mon/cluster.yml
@@ -7,15 +7,3 @@
   ceph:
     mon:
       enabled: true
-      keyring:
-        mon:
-          key: ${_param:ceph_mon_keyring}
-          caps:
-            mon: "allow *"
-        admin:
-          key: ${_param:ceph_admin_keyring}
-          caps:
-            mds: "allow *"
-            mgr: "allow *"
-            mon: "allow *"
-            osd: "allow *"
\ No newline at end of file

metadata/service/mon/single.yml

diff --git a/metadata/service/mon/single.yml b/metadata/service/mon/single.yml
index da43193..8be5da5 100644
--- a/metadata/service/mon/single.yml
+++ b/metadata/service/mon/single.yml
@@ -9,13 +9,13 @@
       enabled: true
       keyring:
         mon:
-          key: ${_param:ceph_mon_keyring}
           caps:
             mon: "allow *"
+    common:
+      keyring:
         admin:
-          key: ${_param:ceph_admin_keyring}
           caps:
             mds: "allow *"
             mgr: "allow *"
             mon: "allow *"
-            osd: "allow *"
\ No newline at end of file
+            osd: "allow *"