openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Limit standalone ceph-admin user creation to a single host" into stable/wallaby

Browse Source
This commit is contained in:
Zuul 2022-07-01 00:02:08 +00:00 committed by Gerrit Code Review
commit 7c51c4284d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tripleoclient/v2/overcloud_ceph.py
View File

@ -880,8 +880,16 @@ class OvercloudCephUserEnable(command.Command):
} }
for limit_list in [ceph_hosts['_admin'], ceph_hosts['non_admin']]: for limit_list in [ceph_hosts['_admin'], ceph_hosts['non_admin']]:
if len(limit_list) > 0: if len(limit_list) > 0:
# need to include the undercloud where the keys are generated if parsed_args.standalone:
limit_list.append('undercloud') # In standalone, Ansible groups allovercloud and undercloud
# denote the same single host. So just use undercloud to
# avoid LP 1979093.
limit_list = ['undercloud']
else:
# Need to include the undercloud, where the keys are
# generated, in the subset of allovercloud hosts,
# denoted by limit_list.
limit_list.append('undercloud')
with oooutils.TempDirs() as tmp: with oooutils.TempDirs() as tmp:
oooutils.run_ansible_playbook( oooutils.run_ansible_playbook(
playbook='ceph-admin-user-playbook.yml', playbook='ceph-admin-user-playbook.yml',