openstack
/
python-tripleoclient
Code Issues Proposed changes

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.

Change-Id: I6f9498f2e8e54c6b670d616a3122263cd42c44e8
This commit is contained in:
Emilien Macchi 2019-11-01 12:44:53 +01:00
parent ec1629b7d3
commit e794286d47
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleoclient/config/undercloud.py
View File

@ -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=_(

2
tripleoclient/tests/config/test_config_undercloud.py
View File

@ -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',

5
tripleoclient/v1/undercloud_config.py
View File

@ -432,6 +432,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']