openstack
/
python-tripleoclient
Code Issues Proposed changes

Refactor BM deployment to use '--work-dir' [1/2] 

We added '--output-dir' just a few weeks ago, now it seems
we want to use '--work-dir'. See:
https://review.opendev.org/775302.

Let's re-factor to use the common consistent working directory.

Change-Id: Ic62c599d79383bea18780cc5c25fc5f4843207a2
This commit is contained in:
Harald Jensås 2021-03-16 21:19:05 +01:00
parent 4139b75157
commit 9f9a7e9f7b
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tripleoclient/tests/v2/overcloud_node/test_overcloud_node.py
View File

@ -353,6 +353,7 @@ class TestProvisionNode(fakes.TestOvercloudNode):
'concurrency': 20,
'manage_network_ports': False,
'output_dir': mock.ANY,
'working_dir': mock.ANY,
},
inventory='localhost,',
playbook='cli-overcloud-node-provision.yaml',

20
tripleoclient/v2/overcloud_node.py
View File

@ -256,6 +256,8 @@ class ProvisionNode(command.Command):
help=_('Enable provisioning of network ports'),
default=False,
action="store_true")
# TODO(hjensas): Remove 'output-dir' use common 'workdir' instead.
# See: https://review.opendev.org/775302
parser.add_argument('--output-dir',
help=_('Directory to use for saved output. '
'When not specified, '
@ -263,11 +265,26 @@ class ProvisionNode(command.Command):
'used.'),
action='store',
default=None)
parser.add_argument(
'--working-dir', action='store',
help=_('The working directory for the deployment where all '
'input, output, and generated files will be stored.\n'
'Defaults to "$HOME/overcloud-deploy-<stack>"')
)
return parser
def take_action(self, parsed_args):
self.log.debug("take_action(%s)" % parsed_args)
if not parsed_args.working_dir:
working_dir = os.path.join(
os.path.expanduser('~'),
"overcloud-deploy-%s" % parsed_args.stack)
else:
working_dir = os.path.abspath(parsed_args.working_dir)
oooutils.makedirs(working_dir)
with open(parsed_args.input, 'r') as fp:
roles = yaml.safe_load(fp)
@ -292,7 +309,8 @@ class ProvisionNode(command.Command):
"node_timeout": parsed_args.timeout,
"concurrency": parsed_args.concurrency,
"manage_network_ports": parsed_args.network_ports,
"output_dir": output_dir
"output_dir": output_dir,
"working_dir": working_dir
}
with oooutils.TempDirs() as tmp: