openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Enable cleanup by default for undercloud install"

Browse Source
This commit is contained in:
Zuul
2018-05-08 04:20:56 +00:00
committed by Gerrit Code Review
parent 7eba4e168d cb7a79bfb6
commit 0fa4ae69c0
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tripleoclient/config/base.py
View File

@@ -39,8 +39,12 @@ class BaseConfig(object):
'templates, ansible deployment files.'),
),
cfg.BoolOpt('cleanup',
default=False,
help=('Cleanup temporary files'),
default=True,
help=('Cleanup temporary files. Setting this to '
'False will leave the temporary files used '
'during deployment in place after the command '
'is run. This is useful for debugging the '
'generated files or if errors occur.'),
),
]
return self.sort_opts(_opts)

12
tripleoclient/tests/v1/undercloud/test_undercloud.py
View File

@@ -110,7 +110,7 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '--output-dir=/foo',
'undercloud.yaml', '--output-dir=/foo', '--cleanup',
'-e', '/foo/undercloud_parameters.yaml',
'--log-file=/tmp/install-undercloud.log'])
@@ -267,7 +267,7 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '--output-dir=/home/stack',
'undercloud.yaml', '--output-dir=/home/stack', '--cleanup',
'-e', '/home/stack/undercloud_parameters.yaml',
'--log-file=/tmp/install-undercloud.log'])
@@ -322,7 +322,7 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '--output-dir=/home/stack',
'undercloud.yaml', '--output-dir=/home/stack', '--cleanup',
'-e', '/home/stack/undercloud_parameters.yaml',
'--debug', '--log-file=/tmp/install-undercloud.log'])
@@ -379,7 +379,7 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '--output-dir=/home/stack',
'undercloud.yaml', '--output-dir=/home/stack', '--cleanup',
'-e', '/home/stack/undercloud_parameters.yaml',
'--log-file=/tmp/install-undercloud.log'])
@@ -466,7 +466,7 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '--output-dir=/home/stack',
'undercloud.yaml', '--output-dir=/home/stack', '--cleanup',
'-e', '/home/stack/undercloud_parameters.yaml',
'--log-file=/tmp/install-undercloud.log'])
@@ -522,6 +522,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '--output-dir=/home/stack',
'undercloud.yaml', '--output-dir=/home/stack', '--cleanup',
'-e', '/home/stack/undercloud_parameters.yaml',
'--debug', '--log-file=/tmp/install-undercloud.log'])