diff --git a/tripleoclient/tests/v1/undercloud/test_install_upgrade.py b/tripleoclient/tests/v1/undercloud/test_install_upgrade.py index 253ae40a6..90e7f9cb5 100644 --- a/tripleoclient/tests/v1/undercloud/test_install_upgrade.py +++ b/tripleoclient/tests/v1/undercloud/test_install_upgrade.py @@ -91,8 +91,6 @@ class TestUndercloudInstall(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic-inspector.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/undercloud-remove-novajoin.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', '--public-virtual-ip', '192.168.24.2', '--control-virtual-ip', '192.168.24.3', '-e', @@ -150,8 +148,6 @@ class TestUndercloudInstall(TestPluginV1): '/home/stack/foo.yaml', '-e', '/usertht/environments/services/ironic.yaml', '-e', '/usertht/environments/services/ironic-inspector.yaml', '-e', - '/usertht/environments/services/' - 'undercloud-remove-novajoin.yaml', '-e', '/usertht/environments/public-tls-undercloud.yaml', '--public-virtual-ip', '192.168.24.2', '--control-virtual-ip', '192.168.24.3', '-e', @@ -310,8 +306,6 @@ class TestUndercloudInstall(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic-inspector.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/undercloud-remove-novajoin.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', '--public-virtual-ip', '4.3.2.1', '--control-virtual-ip', '192.168.24.3', '-e', @@ -372,8 +366,6 @@ class TestUndercloudInstall(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic-inspector.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/undercloud-remove-novajoin.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', '--public-virtual-ip', '192.168.24.2', '--control-virtual-ip', '192.168.24.3', '-e', @@ -430,8 +422,6 @@ class TestUndercloudInstall(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic-inspector.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/undercloud-remove-novajoin.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', '--public-virtual-ip', '192.168.24.2', '--control-virtual-ip', '192.168.24.3', '-e', @@ -485,8 +475,6 @@ class TestUndercloudInstall(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic-inspector.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/undercloud-remove-novajoin.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/barbican.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'barbican-backend-simple-crypto.yaml', '-e', @@ -575,8 +563,6 @@ class TestUndercloudUpgrade(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic-inspector.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/undercloud-remove-novajoin.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', '--public-virtual-ip', '192.168.24.2', '--control-virtual-ip', '192.168.24.3', '-e', @@ -660,8 +646,6 @@ class TestUndercloudUpgrade(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic-inspector.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/undercloud-remove-novajoin.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', '--public-virtual-ip', '192.168.24.2', '--control-virtual-ip', '192.168.24.3', '-e', @@ -722,8 +706,6 @@ class TestUndercloudUpgrade(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic-inspector.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/undercloud-remove-novajoin.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', '--public-virtual-ip', '192.168.24.2', '--control-virtual-ip', '192.168.24.3', '-e', @@ -783,8 +765,6 @@ class TestUndercloudUpgrade(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic-inspector.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/undercloud-remove-novajoin.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', '--public-virtual-ip', '192.168.24.2', '--control-virtual-ip', '192.168.24.3', '-e', @@ -842,8 +822,6 @@ class TestUndercloudUpgrade(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic-inspector.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/undercloud-remove-novajoin.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', '--public-virtual-ip', '192.168.24.2', '--control-virtual-ip', '192.168.24.3', '-e', @@ -907,8 +885,6 @@ class TestUndercloudUpgrade(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic-inspector.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/undercloud-remove-novajoin.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', '--public-virtual-ip', '192.168.24.2', '--control-virtual-ip', '192.168.24.3', '-e', diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py index 6bce9a402..a7c16241c 100644 --- a/tripleoclient/v1/undercloud_config.py +++ b/tripleoclient/v1/undercloud_config.py @@ -631,11 +631,6 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True, tht_templates, "environments/services/undercloud-tls.yaml")] env_data['UndercloudIpaOtp'] = CONF['ipa_otp'] - # add service to remove novajoin containers - deploy_args += ['-e', os.path.join( - tht_templates, 'environments/services/undercloud-remove-novajoin.yaml') - ] - if CONF.get('enable_swift'): deploy_args += ['-e', os.path.join( tht_templates, "environments/undercloud-enable-swift.yaml")]