openstack/python-tripleoclient
Code Issues Proposed changes

Make --osd-spec and --crush-hierarchy not mutually exclusive

Browse Source 
Allow 'openstack overcloud ceph deploy' to take both the
--osd-spec and --crush-hierarchy arguments by removing
--crush-hierarchy from the mutually exclusive spec_group
and adding it to the regular parser.

Also, do not use mutually exclusive spec_group for 'openstack
overcloud ceph spec' since the --ceph-spec optsion is never
passed to 'openstack overcloud ceph spec'.

Conflict tripleoclient/v2/overcloud_ceph.py
OvercloudCephSpec class is not in wallaby so only OvercloudCephDeploy
class was modified.

Closes-Bug: 1964033
Change-Id: I88ed9e4f65ba0adfefd5e84111e4f787f77c5b97
(cherry picked from commit 88864174e8)
This commit is contained in:
John Fulton 2022-03-07 21:21:35 +00:00
parent 423daff2f3
commit a54441ec5c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tripleoclient/v2/overcloud_ceph.py
View File

@ -189,11 +189,11 @@ class OvercloudCephDeploy(command.Command):
"data_devices value inside the " "data_devices value inside the "
"Ceph spec file."), "Ceph spec file."),
default=None) default=None)
spec_group.add_argument('--crush-hierarchy', parser.add_argument('--crush-hierarchy',
help=_( help=_(
"Path to an existing crush hierarchy spec " "Path to an existing crush hierarchy spec "
"file. "), "file. "),
default=None) default=None)
parser.add_argument('--container-image-prepare', parser.add_argument('--container-image-prepare',
help=_( help=_(
"Path to an alternative " "Path to an alternative "