openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Move ceph_admin_extra_vars logic to tripleo-ansible" into stable/wallaby

This commit is contained in:
Zuul 2021-05-27 16:54:15 +00:00 committed by Gerrit Code Review
parent b2231d4481 8775a8bbe1
commit 59d930faa6
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deployment/cephadm/ceph-base.yaml
View File

@ -579,18 +579,6 @@ outputs:
ms_client_mode: secure
- {get_attr: [DefaultCephConfigOverrides, value, vars]}
cephadm_extra_vars: {get_attr: [CephAdmVars, value, vars]}
ceph_admin_extra_vars: # user creation
tripleo_admin_generate_key: false
distribute_private_key: true
tripleo_admin_user: ceph-admin
ssh_servers: "{{ groups['ceph_mon'] |
union(groups['ceph_osd']|default([])) |
union(groups['ceph_mgr']|default([])) |
union(groups['ceph_rgw']|default([])) |
union(groups['ceph_mds']|default([])) |
union(groups['ceph_nfs']|default([])) |
union(groups['ceph_rbdmirror']|default([])) |
unique }}"
- name: Prepare cephadm user and keys
include_role:
name: tripleo_run_cephadm