From a54441ec5ca201e74e9f0d9ad6e12e141aef9fa5 Mon Sep 17 00:00:00 2001 From: John Fulton Date: Mon, 7 Mar 2022 21:21:35 +0000 Subject: [PATCH] Make --osd-spec and --crush-hierarchy not mutually exclusive 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 88864174e801cb2dc5df7ac9b74df033a1efab6f) --- tripleoclient/v2/overcloud_ceph.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tripleoclient/v2/overcloud_ceph.py b/tripleoclient/v2/overcloud_ceph.py index d6e78e481..3f485fdc5 100644 --- a/tripleoclient/v2/overcloud_ceph.py +++ b/tripleoclient/v2/overcloud_ceph.py @@ -189,11 +189,11 @@ class OvercloudCephDeploy(command.Command): "data_devices value inside the " "Ceph spec file."), default=None) - spec_group.add_argument('--crush-hierarchy', - help=_( - "Path to an existing crush hierarchy spec " - "file. "), - default=None) + parser.add_argument('--crush-hierarchy', + help=_( + "Path to an existing crush hierarchy spec " + "file. "), + default=None) parser.add_argument('--container-image-prepare', help=_( "Path to an alternative "