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 <dsavinea@redhat.com>

diff --git a/group_vars/mons.yml.sample b/group_vars/mons.yml.sample
index 89f75fe1bff602da25078e2e7862a80dbe89abac..8e19b10378030f30683efd97e11aff6fb4224fe1 100644 (file)
--- 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
index 47f7d71045db3057c63372fd97c3c869c5d0dee4..e0edb2bb8794bb67c2867c4e137a42fdbcc9ca5e 100644 (file)
--- 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
index 25d8a19f6f7b6db888c1e3b03a38bf71df12eeb8..c92de2a920c86f39174a352b430960b7516e4e00 100644 (file)
--- 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