mirror of https://github.com/ceph/ceph-ansible.git
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>
(cherry picked from commit 58a9d310d5
)
pull/3645/head
parent
05c6ac4d78
commit
77596c791d
|
@ -31,6 +31,11 @@ dummy:
|
|||
# - nodelete
|
||||
# - nosizechange
|
||||
|
||||
#client_admin_ceph_authtool_cap:
|
||||
# mon: allow *
|
||||
# osd: allow *
|
||||
# mds: allow *
|
||||
# mgr: allow *
|
||||
|
||||
###############
|
||||
# CRUSH RULES #
|
||||
|
|
|
@ -23,6 +23,11 @@ secure_cluster_flags:
|
|||
- nodelete
|
||||
- nosizechange
|
||||
|
||||
client_admin_ceph_authtool_cap:
|
||||
mon: allow *
|
||||
osd: allow *
|
||||
mds: allow *
|
||||
mgr: allow *
|
||||
|
||||
###############
|
||||
# CRUSH RULES #
|
||||
|
|
|
@ -48,17 +48,6 @@
|
|||
mode: "0755"
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue