undercloud: introduce undercloud_enable_paunch option
Set to True by default, Paunch remains enabled.
However it can be switched to False, then the Undercloud containers will
be deployed by tripleo-ansible.
Depends-On: https://review.opendev.org/#/c/708044/
Change-Id: I6f9498f2e8e54c6b670d616a3122263cd42c44e8
(cherry picked from commit e794286d47
)
This commit is contained in:
parent
4c2ca9628b
commit
4c46dc1678
|
@ -284,6 +284,10 @@ class UndercloudConfig(StandaloneConfig):
|
|||
default=True,
|
||||
help=_('Enable or disable SELinux during the '
|
||||
'deployment.')),
|
||||
cfg.BoolOpt('undercloud_enable_paunch',
|
||||
default=True,
|
||||
help=_('Enable or disable Paunch to manage '
|
||||
'containers.')),
|
||||
cfg.BoolOpt('undercloud_update_packages',
|
||||
default=False,
|
||||
help=_(
|
||||
|
|
|
@ -67,6 +67,7 @@ class TestUndercloudConfig(base.TestCase):
|
|||
'templates',
|
||||
'undercloud_admin_host',
|
||||
'undercloud_debug',
|
||||
'undercloud_enable_paunch',
|
||||
'undercloud_enable_selinux',
|
||||
'undercloud_hostname',
|
||||
'undercloud_log_file',
|
||||
|
@ -133,6 +134,7 @@ class TestUndercloudConfig(base.TestCase):
|
|||
'templates',
|
||||
'undercloud_admin_host',
|
||||
'undercloud_debug',
|
||||
'undercloud_enable_paunch',
|
||||
'undercloud_enable_selinux',
|
||||
'undercloud_hostname',
|
||||
'undercloud_log_file',
|
||||
|
|
|
@ -469,6 +469,11 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
|
|||
else:
|
||||
env_data['SELinuxMode'] = 'permissive'
|
||||
|
||||
if CONF.get('undercloud_enable_paunch'):
|
||||
env_data['EnablePaunch'] = True
|
||||
else:
|
||||
env_data['EnablePaunch'] = False
|
||||
|
||||
if CONF.get('undercloud_ntp_servers', None):
|
||||
env_data['NtpServer'] = CONF['undercloud_ntp_servers']
|
||||
|
||||
|
|
Loading…
Reference in New Issue