Add enable_frr option

Depends-On: https://review.opendev.org/763657
Change-Id: I4e5f2a2531342115d9059d7478e2da4c3f906278

releasenotes/notes/add-frr-service-option-71c20b6512f435dc.yaml

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

tripleoclient/config/standalone.py

@@ -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,
                                 tempest=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.')),

tripleoclient/tests/config/test_config_standalone.py

@@ -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',
@@ -62,6 +63,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,
@@ -73,6 +75,7 @@ class TestStandaloneConfig(base.TestCase):
                                                   validations=True,
                                                   zaqar=True)
         expected = ['enable_cinder',
+                    'enable_frr',
                     'enable_ironic',
                     'enable_ironic_inspector',
                     'enable_mistral',
@@ -98,6 +101,7 @@ class TestStandaloneConfig(base.TestCase):
                     'custom_env_files',
                     'deployment_user',
                     'enable_cinder',
+                    'enable_frr',
                     'enable_ironic',
                     'enable_ironic_inspector',
                     'enable_mistral',

tripleoclient/tests/config/test_config_undercloud.py

@@ -93,6 +93,7 @@ class TestUndercloudConfig(base.TestCase):
                     'deployment_user',
                     'discovery_default_driver',
                     'enable_cinder',
+                    'enable_frr',
                     'enable_ironic',
                     'enable_ironic_inspector',
                     'enable_mistral',
@@ -164,6 +165,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,

tripleoclient/v1/undercloud_config.py

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