openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Don't use stack name in default config_download_dir"

This commit is contained in:
Zuul 2020-07-03 11:30:44 +00:00 committed by Gerrit Code Review
parent ccb9019d09 e4d9bb17be
commit 2bb2b9aeb1
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleoclient/tests/v1/test_overcloud_export.py
View File

@ -52,7 +52,7 @@ class TestOvercloudExport(utils.TestCommand):
self.app.client_manager.tripleoclient.object_store,
'overcloud', True)
path = os.path.join(os.environ.get('HOME'),
'config-download/overcloud')
'config-download')
mock_export_stack.assert_called_once_with(
self.app.client_manager.orchestration,
'overcloud',
@ -81,7 +81,7 @@ class TestOvercloudExport(utils.TestCommand):
self.app.client_manager.tripleoclient.object_store,
'foo', True)
path = os.path.join(os.environ.get('HOME'),
'config-download/foo')
'config-download')
mock_export_stack.assert_called_once_with(
self.app.client_manager.orchestration,
'foo',

5
tripleoclient/v1/overcloud_export.py
View File

@ -51,7 +51,7 @@ class ExportOvercloud(command.Command):
action='store',
help=_('Directory to search for config-download '
'export data. Defaults to '
'$HOME/config-download/<stack>'))
'$HOME/config-download'))
parser.add_argument('--no-password-excludes',
action='store_true',
dest='no_password_excludes',
@ -79,8 +79,7 @@ class ExportOvercloud(command.Command):
if not parsed_args.config_download_dir:
config_download_dir = os.path.join(os.environ.get('HOME'),
'config-download',
parsed_args.stack)
'config-download')
else:
config_download_dir = parsed_args.config_download_dir