From 40d1be0aa84d5dc4c61e4e50900bc3baa1b6115d Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Thu, 16 Sep 2021 14:31:47 -0600
Subject: [PATCH] Remove zaqar

Additional zaqar cleanup

Change-Id: I9f354f4c63458ef077f1d72aafa14c69e5ba02f6
---
 tripleoclient/config/standalone.py                   |  9 +--------
 tripleoclient/config/undercloud.py                   |  3 +--
 tripleoclient/tests/config/test_config_standalone.py | 10 +++-------
 tripleoclient/tests/config/test_config_undercloud.py |  4 +---
 tripleoclient/v1/undercloud_config.py                |  4 ----
 5 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/tripleoclient/config/standalone.py b/tripleoclient/config/standalone.py
index d171d0b02..6ca70d7c7 100644
--- a/tripleoclient/config/standalone.py
+++ b/tripleoclient/config/standalone.py
@@ -55,8 +55,7 @@ class StandaloneConfig(BaseConfig):
                                 ironic_inspector=False,
                                 nova=False, novajoin=False, swift=False,
                                 telemetry=False, validations=False,
-                                zaqar=False, neutron=False, heat=False,
-                                keystone=True):
+                                neutron=False, heat=False, keystone=True):
         _opts = [
             # service enablement
             cfg.BoolOpt('enable_cinder',
@@ -99,12 +98,6 @@ class StandaloneConfig(BaseConfig):
                             'Whether to install requirements to run the '
                             'TripleO validations.')
                         ),
-            cfg.BoolOpt('enable_zaqar',
-                        default=zaqar,
-                        deprecated_for_removal=True,
-                        deprecated_reason=('Support for the zaqar service '
-                                           'has been deprecated.'),
-                        help=_('Whether to enable the zaqar service.')),
             cfg.BoolOpt('enable_neutron',
                         default=neutron,
                         help=_('Whether to enable the neutron service.')),
diff --git a/tripleoclient/config/undercloud.py b/tripleoclient/config/undercloud.py
index 4643346a9..b88dcc09f 100644
--- a/tripleoclient/config/undercloud.py
+++ b/tripleoclient/config/undercloud.py
@@ -81,8 +81,7 @@ class UndercloudConfig(StandaloneConfig):
             novajoin=False,
             swift=False,
             telemetry=False,
-            validations=True,
-            zaqar=False)
+            validations=True)
 
     def get_base_opts(self):
         _base_opts = super(UndercloudConfig, self).get_base_opts()
diff --git a/tripleoclient/tests/config/test_config_standalone.py b/tripleoclient/tests/config/test_config_standalone.py
index 9a31d8cf3..64eb6f20d 100644
--- a/tripleoclient/tests/config/test_config_standalone.py
+++ b/tripleoclient/tests/config/test_config_standalone.py
@@ -56,8 +56,7 @@ class TestStandaloneConfig(base.TestCase):
                     'enable_novajoin',
                     'enable_swift',
                     'enable_telemetry',
-                    'enable_validations',
-                    'enable_zaqar']
+                    'enable_validations']
         self.assertEqual(expected, [x.name for x in ret])
         for x in ret:
             if x.name == 'enable_keystone':
@@ -79,8 +78,7 @@ class TestStandaloneConfig(base.TestCase):
                                                   novajoin=True,
                                                   swift=True,
                                                   telemetry=True,
-                                                  validations=True,
-                                                  zaqar=True)
+                                                  validations=True)
         expected = ['enable_cinder',
                     'enable_frr',
                     'enable_heat',
@@ -92,8 +90,7 @@ class TestStandaloneConfig(base.TestCase):
                     'enable_novajoin',
                     'enable_swift',
                     'enable_telemetry',
-                    'enable_validations',
-                    'enable_zaqar']
+                    'enable_validations']
         self.assertEqual(expected, [x.name for x in ret])
         for x in ret:
             self.assertEqual(x.default, True, "%s config not True" % x.name)
@@ -120,7 +117,6 @@ class TestStandaloneConfig(base.TestCase):
                     'enable_swift',
                     'enable_telemetry',
                     'enable_validations',
-                    'enable_zaqar',
                     'heat_container_image',
                     'heat_native',
                     'hieradata_override',
diff --git a/tripleoclient/tests/config/test_config_undercloud.py b/tripleoclient/tests/config/test_config_undercloud.py
index d1cbfb17b..30e710511 100644
--- a/tripleoclient/tests/config/test_config_undercloud.py
+++ b/tripleoclient/tests/config/test_config_undercloud.py
@@ -109,7 +109,6 @@ class TestUndercloudConfig(base.TestCase):
                     'enable_swift_encryption',
                     'enable_telemetry',
                     'enable_validations',
-                    'enable_zaqar',
                     'enabled_hardware_types',
                     'generate_service_certificate',
                     'heat_container_image',
@@ -178,8 +177,7 @@ class TestUndercloudConfig(base.TestCase):
                     'enable_novajoin': False,
                     'enable_telemetry': False,
                     'enable_swift': False,
-                    'enable_validations': True,
-                    'enable_zaqar': False}
+                    'enable_validations': True}
         self.assertEqual(sorted(expected.keys()), [x.name for x in ret])
         for x in ret:
             self.assertEqual(expected[x.name], x.default, "%s config not %s" %
diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py
index 5cee05c56..f442e9c11 100644
--- a/tripleoclient/v1/undercloud_config.py
+++ b/tripleoclient/v1/undercloud_config.py
@@ -636,10 +636,6 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
         tht_templates, 'environments/services/undercloud-remove-novajoin.yaml')
         ]
 
-    if CONF.get('enable_zaqar'):
-        deploy_args += ['-e', os.path.join(
-            tht_templates, "environments/services/zaqar-swift-backend.yaml")]
-
     if CONF.get('enable_swift'):
         deploy_args += ['-e', os.path.join(
             tht_templates, "environments/undercloud-enable-swift.yaml")]