undercloud: configure ContainerImagePrepareDebug based on undercloud_debug

Instead of creating a new undercloud.conf parameter to enable the debug
on Container Image Prepare task, let's recycle undercloud_debug.

Depends-On: I7d0b4035de748bf2453321d3ab09d09fd45abf8d

Change-Id: I15d910a53a34d4ac09b2728317506ee0edf981f2
This commit is contained in:
Emilien Macchi 2019-02-14 09:01:38 -05:00
parent 623f841ab9
commit 32b3c4506d
2 changed files with 4 additions and 1 deletions

View File

@ -264,7 +264,8 @@ class UndercloudConfig(StandaloneConfig):
default=True,
help=_(
'Whether to enable the debug log level for '
'Undercloud OpenStack services.')
'Undercloud OpenStack services and Container '
'Image Prepare step.')
),
cfg.BoolOpt('undercloud_enable_selinux',
default=True,

View File

@ -371,6 +371,8 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
env_data['PythonInterpreter'] = sys.executable
env_data['ContainerImagePrepareDebug'] = CONF['undercloud_debug']
for param_key, param_value in PARAMETER_MAPPING.items():
if param_key in CONF.keys():
env_data[param_value] = CONF[param_key]