Remove enable_tempest flag from tripleoclient
Since tempest container is no longer tested in CI and is replaced with os_tempest ansible-role. An user can use and install tempest from rpm which is supported as earlier. It removes all the entry point of tempest container. Depends-On: https://review.opendev.org/c/openstack/tripleo-common/+/771993 Related-Bug: #1916875 Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com> Change-Id: I2e2c126aa95589a8d26eaec9626abbf4a86044ca
This commit is contained in:

committed by
chandan kumar

parent
03e587dbca
commit
733083dc15
@@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
removal:
|
||||||
|
- |
|
||||||
|
Support of Tempest container is removed in favor of os_tempest
|
||||||
|
ansible role.
|
||||||
|
As it is no longer tested by the CI team and not used anywhere.
|
||||||
|
Since tempest is a standalone OpenStack validation tool, can be
|
||||||
|
used via installing through rpm package, which is fully supported.
|
@@ -54,7 +54,7 @@ class StandaloneConfig(BaseConfig):
|
|||||||
def get_enable_service_opts(self, cinder=False, ironic=False,
|
def get_enable_service_opts(self, cinder=False, ironic=False,
|
||||||
ironic_inspector=False, mistral=False,
|
ironic_inspector=False, mistral=False,
|
||||||
nova=False, novajoin=False, swift=False,
|
nova=False, novajoin=False, swift=False,
|
||||||
tempest=False, telemetry=False,
|
telemetry=False,
|
||||||
validations=False, zaqar=False):
|
validations=False, zaqar=False):
|
||||||
_opts = [
|
_opts = [
|
||||||
# service enablement
|
# service enablement
|
||||||
@@ -87,11 +87,6 @@ class StandaloneConfig(BaseConfig):
|
|||||||
help=_('Whether to install Swift services in the '
|
help=_('Whether to install Swift services in the '
|
||||||
'Undercloud.')
|
'Undercloud.')
|
||||||
),
|
),
|
||||||
cfg.BoolOpt('enable_tempest',
|
|
||||||
default=tempest,
|
|
||||||
help=_('Whether to install Tempest in the Undercloud.'
|
|
||||||
'This is a no-op for containerized undercloud.')
|
|
||||||
),
|
|
||||||
cfg.BoolOpt('enable_telemetry',
|
cfg.BoolOpt('enable_telemetry',
|
||||||
default=telemetry,
|
default=telemetry,
|
||||||
help=_('Whether to install Telemetry services '
|
help=_('Whether to install Telemetry services '
|
||||||
|
@@ -78,7 +78,6 @@ class UndercloudConfig(StandaloneConfig):
|
|||||||
nova=False,
|
nova=False,
|
||||||
novajoin=False,
|
novajoin=False,
|
||||||
swift=False,
|
swift=False,
|
||||||
tempest=True,
|
|
||||||
telemetry=False,
|
telemetry=False,
|
||||||
validations=True,
|
validations=True,
|
||||||
zaqar=False)
|
zaqar=False)
|
||||||
|
@@ -53,7 +53,6 @@ class TestStandaloneConfig(base.TestCase):
|
|||||||
'enable_novajoin',
|
'enable_novajoin',
|
||||||
'enable_swift',
|
'enable_swift',
|
||||||
'enable_telemetry',
|
'enable_telemetry',
|
||||||
'enable_tempest',
|
|
||||||
'enable_validations',
|
'enable_validations',
|
||||||
'enable_zaqar']
|
'enable_zaqar']
|
||||||
self.assertEqual(expected, [x.name for x in ret])
|
self.assertEqual(expected, [x.name for x in ret])
|
||||||
@@ -69,7 +68,6 @@ class TestStandaloneConfig(base.TestCase):
|
|||||||
novajoin=True,
|
novajoin=True,
|
||||||
swift=True,
|
swift=True,
|
||||||
telemetry=True,
|
telemetry=True,
|
||||||
tempest=True,
|
|
||||||
validations=True,
|
validations=True,
|
||||||
zaqar=True)
|
zaqar=True)
|
||||||
expected = ['enable_cinder',
|
expected = ['enable_cinder',
|
||||||
@@ -80,7 +78,6 @@ class TestStandaloneConfig(base.TestCase):
|
|||||||
'enable_novajoin',
|
'enable_novajoin',
|
||||||
'enable_swift',
|
'enable_swift',
|
||||||
'enable_telemetry',
|
'enable_telemetry',
|
||||||
'enable_tempest',
|
|
||||||
'enable_validations',
|
'enable_validations',
|
||||||
'enable_zaqar']
|
'enable_zaqar']
|
||||||
self.assertEqual(expected, [x.name for x in ret])
|
self.assertEqual(expected, [x.name for x in ret])
|
||||||
@@ -105,7 +102,6 @@ class TestStandaloneConfig(base.TestCase):
|
|||||||
'enable_novajoin',
|
'enable_novajoin',
|
||||||
'enable_swift',
|
'enable_swift',
|
||||||
'enable_telemetry',
|
'enable_telemetry',
|
||||||
'enable_tempest',
|
|
||||||
'enable_validations',
|
'enable_validations',
|
||||||
'enable_zaqar',
|
'enable_zaqar',
|
||||||
'heat_container_image',
|
'heat_container_image',
|
||||||
|
@@ -105,7 +105,6 @@ class TestUndercloudConfig(base.TestCase):
|
|||||||
'enable_swift',
|
'enable_swift',
|
||||||
'enable_swift_encryption',
|
'enable_swift_encryption',
|
||||||
'enable_telemetry',
|
'enable_telemetry',
|
||||||
'enable_tempest',
|
|
||||||
'enable_validations',
|
'enable_validations',
|
||||||
'enable_zaqar',
|
'enable_zaqar',
|
||||||
'enabled_hardware_types',
|
'enabled_hardware_types',
|
||||||
@@ -173,7 +172,6 @@ class TestUndercloudConfig(base.TestCase):
|
|||||||
'enable_novajoin': False,
|
'enable_novajoin': False,
|
||||||
'enable_telemetry': False,
|
'enable_telemetry': False,
|
||||||
'enable_swift': False,
|
'enable_swift': False,
|
||||||
'enable_tempest': True,
|
|
||||||
'enable_validations': True,
|
'enable_validations': True,
|
||||||
'enable_zaqar': False}
|
'enable_zaqar': False}
|
||||||
self.assertEqual(sorted(expected.keys()), [x.name for x in ret])
|
self.assertEqual(sorted(expected.keys()), [x.name for x in ret])
|
||||||
|
@@ -97,8 +97,6 @@ class TestUndercloudInstall(TestPluginV1):
|
|||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'disable-telemetry.yaml', '-e',
|
'disable-telemetry.yaml', '-e',
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'services/tempest.yaml', '-e',
|
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
|
||||||
'public-tls-undercloud.yaml',
|
'public-tls-undercloud.yaml',
|
||||||
'--public-virtual-ip', '192.168.24.2',
|
'--public-virtual-ip', '192.168.24.2',
|
||||||
'--control-virtual-ip', '192.168.24.3', '-e',
|
'--control-virtual-ip', '192.168.24.3', '-e',
|
||||||
@@ -163,7 +161,6 @@ class TestUndercloudInstall(TestPluginV1):
|
|||||||
'undercloud-remove-novajoin.yaml', '-e',
|
'undercloud-remove-novajoin.yaml', '-e',
|
||||||
'/usertht/environments/'
|
'/usertht/environments/'
|
||||||
'disable-telemetry.yaml', '-e',
|
'disable-telemetry.yaml', '-e',
|
||||||
'/usertht/environments/services/tempest.yaml', '-e',
|
|
||||||
'/usertht/environments/public-tls-undercloud.yaml',
|
'/usertht/environments/public-tls-undercloud.yaml',
|
||||||
'--public-virtual-ip', '192.168.24.2',
|
'--public-virtual-ip', '192.168.24.2',
|
||||||
'--control-virtual-ip', '192.168.24.3', '-e',
|
'--control-virtual-ip', '192.168.24.3', '-e',
|
||||||
@@ -328,8 +325,6 @@ class TestUndercloudInstall(TestPluginV1):
|
|||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'disable-telemetry.yaml', '-e',
|
'disable-telemetry.yaml', '-e',
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'services/tempest.yaml', '-e',
|
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
|
||||||
'public-tls-undercloud.yaml',
|
'public-tls-undercloud.yaml',
|
||||||
'--public-virtual-ip', '4.3.2.1',
|
'--public-virtual-ip', '4.3.2.1',
|
||||||
'--control-virtual-ip', '192.168.24.3', '-e',
|
'--control-virtual-ip', '192.168.24.3', '-e',
|
||||||
@@ -397,8 +392,6 @@ class TestUndercloudInstall(TestPluginV1):
|
|||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'disable-telemetry.yaml', '-e',
|
'disable-telemetry.yaml', '-e',
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'services/tempest.yaml', '-e',
|
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
|
||||||
'public-tls-undercloud.yaml',
|
'public-tls-undercloud.yaml',
|
||||||
'--public-virtual-ip', '192.168.24.2',
|
'--public-virtual-ip', '192.168.24.2',
|
||||||
'--control-virtual-ip', '192.168.24.3', '-e',
|
'--control-virtual-ip', '192.168.24.3', '-e',
|
||||||
@@ -462,8 +455,6 @@ class TestUndercloudInstall(TestPluginV1):
|
|||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'disable-telemetry.yaml', '-e',
|
'disable-telemetry.yaml', '-e',
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'services/tempest.yaml', '-e',
|
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
|
||||||
'public-tls-undercloud.yaml',
|
'public-tls-undercloud.yaml',
|
||||||
'--public-virtual-ip', '192.168.24.2',
|
'--public-virtual-ip', '192.168.24.2',
|
||||||
'--control-virtual-ip', '192.168.24.3', '-e',
|
'--control-virtual-ip', '192.168.24.3', '-e',
|
||||||
@@ -524,8 +515,6 @@ class TestUndercloudInstall(TestPluginV1):
|
|||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'disable-telemetry.yaml', '-e',
|
'disable-telemetry.yaml', '-e',
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'services/tempest.yaml', '-e',
|
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
|
||||||
'services/barbican.yaml', '-e',
|
'services/barbican.yaml', '-e',
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'barbican-backend-simple-crypto.yaml', '-e',
|
'barbican-backend-simple-crypto.yaml', '-e',
|
||||||
@@ -676,8 +665,6 @@ class TestUndercloudUpgrade(TestPluginV1):
|
|||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'disable-telemetry.yaml', '-e',
|
'disable-telemetry.yaml', '-e',
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'services/tempest.yaml', '-e',
|
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
|
||||||
'public-tls-undercloud.yaml',
|
'public-tls-undercloud.yaml',
|
||||||
'--public-virtual-ip', '192.168.24.2',
|
'--public-virtual-ip', '192.168.24.2',
|
||||||
'--control-virtual-ip', '192.168.24.3', '-e',
|
'--control-virtual-ip', '192.168.24.3', '-e',
|
||||||
@@ -745,8 +732,6 @@ class TestUndercloudUpgrade(TestPluginV1):
|
|||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'disable-telemetry.yaml', '-e',
|
'disable-telemetry.yaml', '-e',
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'services/tempest.yaml', '-e',
|
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
|
||||||
'public-tls-undercloud.yaml',
|
'public-tls-undercloud.yaml',
|
||||||
'--public-virtual-ip', '192.168.24.2',
|
'--public-virtual-ip', '192.168.24.2',
|
||||||
'--control-virtual-ip', '192.168.24.3', '-e',
|
'--control-virtual-ip', '192.168.24.3', '-e',
|
||||||
@@ -813,8 +798,6 @@ class TestUndercloudUpgrade(TestPluginV1):
|
|||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'disable-telemetry.yaml', '-e',
|
'disable-telemetry.yaml', '-e',
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'services/tempest.yaml', '-e',
|
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
|
||||||
'public-tls-undercloud.yaml',
|
'public-tls-undercloud.yaml',
|
||||||
'--public-virtual-ip', '192.168.24.2',
|
'--public-virtual-ip', '192.168.24.2',
|
||||||
'--control-virtual-ip', '192.168.24.3', '-e',
|
'--control-virtual-ip', '192.168.24.3', '-e',
|
||||||
@@ -879,8 +862,6 @@ class TestUndercloudUpgrade(TestPluginV1):
|
|||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'disable-telemetry.yaml', '-e',
|
'disable-telemetry.yaml', '-e',
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'services/tempest.yaml', '-e',
|
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
|
||||||
'public-tls-undercloud.yaml',
|
'public-tls-undercloud.yaml',
|
||||||
'--public-virtual-ip', '192.168.24.2',
|
'--public-virtual-ip', '192.168.24.2',
|
||||||
'--control-virtual-ip', '192.168.24.3', '-e',
|
'--control-virtual-ip', '192.168.24.3', '-e',
|
||||||
@@ -951,8 +932,6 @@ class TestUndercloudUpgrade(TestPluginV1):
|
|||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'disable-telemetry.yaml', '-e',
|
'disable-telemetry.yaml', '-e',
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
||||||
'services/tempest.yaml', '-e',
|
|
||||||
'/usr/share/openstack-tripleo-heat-templates/environments/'
|
|
||||||
'public-tls-undercloud.yaml',
|
'public-tls-undercloud.yaml',
|
||||||
'--public-virtual-ip', '192.168.24.2',
|
'--public-virtual-ip', '192.168.24.2',
|
||||||
'--control-virtual-ip', '192.168.24.3', '-e',
|
'--control-virtual-ip', '192.168.24.3', '-e',
|
||||||
|
@@ -665,11 +665,6 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
|
|||||||
tht_templates,
|
tht_templates,
|
||||||
"environments/services/undercloud-cinder.yaml")]
|
"environments/services/undercloud-cinder.yaml")]
|
||||||
|
|
||||||
if CONF.get('enable_tempest'):
|
|
||||||
deploy_args += ['-e', os.path.join(
|
|
||||||
tht_templates,
|
|
||||||
"environments/services/tempest.yaml")]
|
|
||||||
|
|
||||||
if CONF.get('enable_swift_encryption'):
|
if CONF.get('enable_swift_encryption'):
|
||||||
deploy_args += [
|
deploy_args += [
|
||||||
'-e', os.path.join(tht_templates,
|
'-e', os.path.join(tht_templates,
|
||||||
|
Reference in New Issue
Block a user