mon: Move client admin variable to defaults

There's no need to set the client_admin_ceph_authtool_cap variable via a set_fact task. Instead we can set this in the role defaults. Signed-off-by: Dimitri Savineau <[email protected]>
Shopify · Feb 27, 2019 · 58a9d31 · 58a9d31
1 parent dd7b760
commit 58a9d31
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/group_vars/mons.yml.sample b/group_vars/mons.yml.sample
@@ -31,6 +31,11 @@ dummy:
 #  - nodelete
 #  - nosizechange
 
+#client_admin_ceph_authtool_cap:
+#  mon: allow *
+#  osd: allow *
+#  mds: allow *
+#  mgr: allow *
 
 ###############
 # CRUSH RULES #

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
@@ -23,6 +23,11 @@ secure_cluster_flags:
   - nodelete
   - nosizechange
 
+client_admin_ceph_authtool_cap:
+  mon: allow *
+  osd: allow *
+  mds: allow *
+  mgr: allow *
 
 ###############
 # CRUSH RULES #

diff --git a/roles/ceph-mon/tasks/deploy_monitors.yml b/roles/ceph-mon/tasks/deploy_monitors.yml
@@ -46,17 +46,6 @@
     mode: "u=rwX,g=rX,o=rX"
     recurse: true
 
-- name: set_fact client_admin_ceph_authtool_cap
-  set_fact:
-    client_admin_ceph_authtool_cap:
-      mon: allow *
-      osd: allow *
-      mds: allow *
-      mgr: allow *
-  when:
-    - cephx
-    - admin_secret != 'admin_secret'
-
 - name: create custom admin keyring
   ceph_key:
     name: client.admin