Merge "Limit cephadm private key distribution to mons/mgrs"
This commit is contained in:
commit
951d1dd1de
|
@ -24,9 +24,20 @@
|
||||||
- '{{ inventory_file }}'
|
- '{{ inventory_file }}'
|
||||||
- '{% if ansible_python_interpreter is defined %}-e ansible_python_interpreter={{ ansible_python_interpreter }}{% endif %}'
|
- '{% if ansible_python_interpreter is defined %}-e ansible_python_interpreter={{ ansible_python_interpreter }}{% endif %}'
|
||||||
- '/usr/share/ansible/tripleo-playbooks/ceph-admin-user-playbook.yml'
|
- '/usr/share/ansible/tripleo-playbooks/ceph-admin-user-playbook.yml'
|
||||||
- '-e @{{ playbook_dir}}/cephadm/ceph-admin.yml'
|
- '-e tripleo_admin_user=ceph-admin'
|
||||||
|
cephadm_public_private_ssh_list:
|
||||||
|
- '-e distribute_private_key=true'
|
||||||
|
- '--limit undercloud,ceph_mon,ceph_mgr'
|
||||||
|
cephadm_public_ssh_list:
|
||||||
|
- '-e distribute_private_key=false'
|
||||||
|
- '--limit undercloud,ceph_osd,ceph_rgw,ceph_mds,ceph_nfs,ceph_rbdmirror'
|
||||||
|
|
||||||
- name: Run ceph-admin-user-playbook
|
- name: Run ceph-admin-user-playbook for public and private keys
|
||||||
shell: "{{ cephadm_ssh_list|join(' ') }}"
|
shell: "{{ (cephadm_ssh_list + cephadm_public_private_ssh_list)|join(' ') }}"
|
||||||
|
tags:
|
||||||
|
- run_cephadm
|
||||||
|
|
||||||
|
- name: Run ceph-admin-user-playbook for public keys
|
||||||
|
shell: "{{ (cephadm_ssh_list + cephadm_public_ssh_list)|join(' ') }}"
|
||||||
tags:
|
tags:
|
||||||
- run_cephadm
|
- run_cephadm
|
||||||
|
|
|
@ -32,11 +32,6 @@
|
||||||
tags:
|
tags:
|
||||||
- run_cephadm
|
- run_cephadm
|
||||||
|
|
||||||
- name: generate ceph-admin.yml extra vars for user creation
|
|
||||||
copy:
|
|
||||||
dest: "{{ playbook_dir }}/cephadm/ceph-admin.yml"
|
|
||||||
content: "{{ ceph_admin_extra_vars | to_nice_yaml }}"
|
|
||||||
|
|
||||||
- name: get the list of enabled services on the overcloud
|
- name: get the list of enabled services on the overcloud
|
||||||
set_fact:
|
set_fact:
|
||||||
tripleo_enabled_services: "{{ enabled_services | default([]) }}"
|
tripleo_enabled_services: "{{ enabled_services | default([]) }}"
|
||||||
|
|
Loading…
Reference in New Issue