Allow mgr bootstrap keyring to be defined

In environments where we wish to have manual/greater control over
how the bootstrap keyrings are used, we need to able to externally
define what the mgr keyring secret will be and have ceph-ansible
use it, instead of it being autogenerated

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1610213

Signed-off-by: Graeme Gillies <ggillies@akamai.com>
pull/2990/head
Graeme Gillies 2018-07-31 09:24:21 +10:00 committed by mergify[bot]
parent 19518656a7
commit a46025820d
3 changed files with 3 additions and 0 deletions

View File

@ -17,6 +17,7 @@ dummy:
# ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT # ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT
#monitor_secret: "{{ monitor_keyring.stdout }}" #monitor_secret: "{{ monitor_keyring.stdout }}"
#admin_secret: 'admin_secret' #admin_secret: 'admin_secret'
#mgr_secret: 'mgr_secret'
# Secure your cluster # Secure your cluster
# This will set the following flags on all the pools: # This will set the following flags on all the pools:

View File

@ -9,6 +9,7 @@ mon_group_name: mons
# ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT # ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT
monitor_secret: "{{ monitor_keyring.stdout }}" monitor_secret: "{{ monitor_keyring.stdout }}"
admin_secret: 'admin_secret' admin_secret: 'admin_secret'
mgr_secret: 'mgr_secret'
# Secure your cluster # Secure your cluster
# This will set the following flags on all the pools: # This will set the following flags on all the pools:

View File

@ -76,6 +76,7 @@
osd: allow * osd: allow *
mds: allow * mds: allow *
cluster: "{{ cluster }}" cluster: "{{ cluster }}"
secret: "{{ (mgr_secret != 'mgr_secret') | ternary(mgr_secret, omit) }}"
when: when:
- cephx - cephx
- groups.get(mgr_group_name, []) | length > 0 - groups.get(mgr_group_name, []) | length > 0