openstack
/
python-tripleoclient
Code Issues Proposed changes

Enable cleanup by default for undercloud install 

The goal of this change is to remove the randomly generated data that we
we use during the installation of the undercloud by default.  This
change switches the cleanup configuration in the undercloud.conf to
be true by default so we cleanup the generated heat temporary files by
default. The undercloud deploy flag still remains the same where it is
not currently enabled by default if you leverage the 'openstack
undercloud deploy' command.

Change-Id: I027a76d2f37a5af5bd0a599783287632298acf3f
Related-Bug: #1761810
This commit is contained in:
Alex Schultz 2018-04-17 13:24:18 -06:00 committed by Emilien Macchi
parent fb222963b8
commit cb7a79bfb6
2 changed files with 12 additions and 8 deletions
Show Stats 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'])
@ -468,7 +468,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'])
@ -526,6 +526,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'])