openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Add cell export to overcloud deploy"

This commit is contained in:
Zuul 2022-08-09 15:12:26 +00:00 committed by Gerrit Code Review
parent 2885c65257 43c2810d65
commit 4a3ffbbabe
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
View File

@ -1395,7 +1395,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
0, 12345678, 0,
1585820526,
1585820526,
0, 0, 0]):
0, 0, 0, 0, 0]):
self.cmd.take_action(parsed_args)
self.assertIn([
mock.call(

35
tripleoclient/v1/overcloud_deploy.py
View File

@ -582,6 +582,18 @@ class DeployOvercloud(command.Command):
return [output_path]
def _export_stack(self, parsed_args, should_filter,
config_download_dir, export_file):
# Create overcloud export
data = export.export_overcloud(
self.working_dir,
parsed_args.stack, True, should_filter,
config_download_dir)
# write the exported data
with open(export_file, 'w') as f:
yaml.safe_dump(data, f, default_flow_style=False)
os.chmod(export_file, 0o600)
def setup_ephemeral_heat(self, parsed_args):
self.log.info("Using ephemeral heat for stack operation")
self.heat_launcher = utils.get_heat_launcher(
@ -1291,16 +1303,19 @@ class DeployOvercloud(command.Command):
try:
if do_stack:
# Create overcloud export
data = export.export_overcloud(
self.working_dir,
parsed_args.stack, True, False,
config_download_dir)
export_file = os.path.join(
self.working_dir, "%s-export.yaml" % parsed_args.stack)
# write the exported data
with open(export_file, 'w') as f:
yaml.safe_dump(data, f, default_flow_style=False)
os.chmod(export_file, 0o600)
self._export_stack(
parsed_args, False,
config_download_dir,
os.path.join(
self.working_dir, "%s-export.yaml" %
parsed_args.stack))
# Create overcloud cell export
self._export_stack(
parsed_args, True,
config_download_dir,
os.path.join(
self.working_dir, "%s-cell-export.yaml" %
parsed_args.stack))
except Exception as e:
self.log.error('Exception creating overcloud export.')
self.log.error(e)