openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Add enable_frr option"

This commit is contained in:
Zuul 2021-03-14 12:23:02 +00:00 committed by Gerrit Code Review
parent 18ff3a6222 fd1d664977
commit 6ab4d15863
5 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
releasenotes/notes/add-frr-service-option-71c20b6512f435dc.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Added option ``enable_frr`` to enable the TripleO FRR service in standalone
and undercloud deployments.

5
tripleoclient/config/standalone.py
View File

@ -51,7 +51,7 @@ NETCONFIG_TAGS_EXAMPLE = """
class StandaloneConfig(BaseConfig):
def get_enable_service_opts(self, cinder=False, ironic=False,
def get_enable_service_opts(self, cinder=False, frr=False, ironic=False,
ironic_inspector=False, mistral=False,
nova=False, novajoin=False, swift=False,
telemetry=False,
@ -63,6 +63,9 @@ class StandaloneConfig(BaseConfig):
help=_(
'Whether to install the Volume service. It is not '
'currently used in the undercloud.')),
cfg.BoolOpt('enable_frr',
default=frr,
help=_('Whether to enable the frr service.')),
cfg.BoolOpt('enable_ironic',
default=ironic,
help=_('Whether to enable the ironic service.')),

4
tripleoclient/tests/config/test_config_standalone.py
View File

@ -46,6 +46,7 @@ class TestStandaloneConfig(base.TestCase):
def test_get_service_opts(self):
ret = self.config.get_enable_service_opts()
expected = ['enable_cinder',
'enable_frr',
'enable_ironic',
'enable_ironic_inspector',
'enable_mistral',
@ -61,6 +62,7 @@ class TestStandaloneConfig(base.TestCase):
def test_get_service_opts_enabled(self):
ret = self.config.get_enable_service_opts(cinder=True,
frr=True,
ironic=True,
ironic_inspector=True,
mistral=True,
@ -71,6 +73,7 @@ class TestStandaloneConfig(base.TestCase):
validations=True,
zaqar=True)
expected = ['enable_cinder',
'enable_frr',
'enable_ironic',
'enable_ironic_inspector',
'enable_mistral',
@ -95,6 +98,7 @@ class TestStandaloneConfig(base.TestCase):
'custom_env_files',
'deployment_user',
'enable_cinder',
'enable_frr',
'enable_ironic',
'enable_ironic_inspector',
'enable_mistral',

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

@ -95,6 +95,7 @@ class TestUndercloudConfig(base.TestCase):
'deployment_user',
'discovery_default_driver',
'enable_cinder',
'enable_frr',
'enable_ironic',
'enable_ironic_inspector',
'enable_mistral',
@ -165,6 +166,7 @@ class TestUndercloudConfig(base.TestCase):
def test_get_undercloud_service_opts(self):
ret = self.config.get_undercloud_service_opts()
expected = {'enable_cinder': False,
'enable_frr': False,
'enable_ironic': True,
'enable_ironic_inspector': True,
'enable_mistral': False,

5
tripleoclient/v1/undercloud_config.py
View File

@ -676,6 +676,11 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
env_data['BarbicanSimpleCryptoGlobalDefault'] = True
env_data['SwiftEncryptionEnabled'] = True
if CONF.get('enable_frr'):
deploy_args += ['-e', os.path.join(
tht_templates,
"environments/services/frr.yaml")]
if CONF.get('undercloud_service_certificate'):
# We assume that the certificate is trusted
env_data['InternalTLSCAFile'] = ''