From a05d2f59d44bf31869131eefe41e6c33efc530c1 Mon Sep 17 00:00:00 2001 From: Sandeep Yadav Date: Mon, 12 Apr 2021 08:06:58 +0000 Subject: [PATCH] Remove deploy_args for podman.yaml as its default Removing deploy_args += podman.yaml from undercloud_config.py and minion_config.py as its default now in tht[1]. [1] https://github.com/openstack/tripleo-heat-templates/blob/master/overcloud-resource-registry-puppet.j2.yaml#L303-L304 Change-Id: I18220825dbf5e793809c51c075be27cfe23deb39 --- .../tests/v1/undercloud/minion/test_config.py | 3 -- .../v1/undercloud/test_install_upgrade.py | 31 ++++++------------- tripleoclient/v1/minion_config.py | 5 --- tripleoclient/v1/undercloud_config.py | 6 ---- 4 files changed, 10 insertions(+), 35 deletions(-) diff --git a/tripleoclient/tests/v1/undercloud/minion/test_config.py b/tripleoclient/tests/v1/undercloud/minion/test_config.py index 5dd56707f..1b031339e 100644 --- a/tripleoclient/tests/v1/undercloud/minion/test_config.py +++ b/tripleoclient/tests/v1/undercloud/minion/test_config.py @@ -69,8 +69,6 @@ class TestMinionDeploy(base.TestCase): '-e', '/usr/share/openstack-tripleo-heat-templates/' 'environments/use-dns-for-vips.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/' - 'environments/podman.yaml', - '-e', '/usr/share/openstack-tripleo-heat-templates/' 'environments/services/heat-engine.yaml', '--deployment-user', 'foo', '--output-dir=/home/stack', @@ -141,7 +139,6 @@ class TestMinionDeploy(base.TestCase): '-e', '/foo/environments/undercloud/' 'undercloud-minion.yaml', '-e', '/foo/environments/use-dns-for-vips.yaml', - '-e', '/foo/environments/podman.yaml', '-e', '/foo/environments/services/' 'ironic-conductor.yaml', '--deployment-user', 'bar', diff --git a/tripleoclient/tests/v1/undercloud/test_install_upgrade.py b/tripleoclient/tests/v1/undercloud/test_install_upgrade.py index edc6994d4..5332bf284 100644 --- a/tripleoclient/tests/v1/undercloud/test_install_upgrade.py +++ b/tripleoclient/tests/v1/undercloud/test_install_upgrade.py @@ -86,8 +86,7 @@ class TestUndercloudInstall(TestPluginV1): 'undercloud.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'use-dns-for-vips.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' - 'podman.yaml', '-e', '/home/stack/foo.yaml', '-e', + '/home/stack/foo.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' @@ -153,7 +152,6 @@ class TestUndercloudInstall(TestPluginV1): '--heat-native=False', '-e', '/usertht/environments/undercloud.yaml', '-e', '/usertht/environments/use-dns-for-vips.yaml', '-e', - '/usertht/environments/podman.yaml', '-e', '/home/stack/foo.yaml', '-e', '/usertht/environments/services/ironic.yaml', '-e', '/usertht/environments/services/ironic-inspector.yaml', '-e', @@ -311,8 +309,7 @@ class TestUndercloudInstall(TestPluginV1): 'undercloud.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'use-dns-for-vips.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' - 'podman.yaml', '-e', '/home/stack/foo.yaml', '-e', + '/home/stack/foo.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/' 'environments/services/masquerade-networks.yaml', '-e', @@ -381,8 +378,7 @@ class TestUndercloudInstall(TestPluginV1): 'undercloud.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'use-dns-for-vips.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' - 'podman.yaml', '-e', '/home/stack/foo.yaml', '-e', + '/home/stack/foo.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' @@ -444,8 +440,7 @@ class TestUndercloudInstall(TestPluginV1): 'undercloud.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'use-dns-for-vips.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' - 'podman.yaml', '-e', '/home/stack/foo.yaml', '-e', + '/home/stack/foo.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' @@ -504,8 +499,7 @@ class TestUndercloudInstall(TestPluginV1): 'undercloud.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'use-dns-for-vips.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' - 'podman.yaml', '-e', '/home/stack/foo.yaml', '-e', + '/home/stack/foo.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' @@ -654,8 +648,7 @@ class TestUndercloudUpgrade(TestPluginV1): 'undercloud.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'use-dns-for-vips.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' - 'podman.yaml', '-e', '/home/stack/foo.yaml', '-e', + '/home/stack/foo.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' @@ -721,8 +714,7 @@ class TestUndercloudUpgrade(TestPluginV1): 'undercloud.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'use-dns-for-vips.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' - 'podman.yaml', '-e', '/home/stack/foo.yaml', '-e', + '/home/stack/foo.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' @@ -787,8 +779,7 @@ class TestUndercloudUpgrade(TestPluginV1): 'undercloud.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'use-dns-for-vips.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' - 'podman.yaml', '-e', '/home/stack/foo.yaml', '-e', + '/home/stack/foo.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' @@ -851,8 +842,7 @@ class TestUndercloudUpgrade(TestPluginV1): 'undercloud.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'use-dns-for-vips.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' - 'podman.yaml', '-e', '/home/stack/foo.yaml', '-e', + '/home/stack/foo.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' @@ -921,8 +911,7 @@ class TestUndercloudUpgrade(TestPluginV1): 'undercloud.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'use-dns-for-vips.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' - 'podman.yaml', '-e', '/home/stack/foo.yaml', '-e', + '/home/stack/foo.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/ironic.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' diff --git a/tripleoclient/v1/minion_config.py b/tripleoclient/v1/minion_config.py index 2d45949d4..20e30fcf0 100644 --- a/tripleoclient/v1/minion_config.py +++ b/tripleoclient/v1/minion_config.py @@ -246,11 +246,6 @@ def prepare_minion_deploy(upgrade=False, no_validations=False, '-e', os.path.join(tht_templates, 'environments/use-dns-for-vips.yaml') ] - # TODO(aschultz): remove when podman is actual default - deploy_args += [ - '-e', os.path.join(tht_templates, 'environments/podman.yaml') - ] - # If a container images file is used, copy it into the tempdir to make it # later into other deployment artifacts and user-provided files. _container_images_config(CONF, deploy_args, env_data, tempdir) diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py index 7f340e91d..0db7b3db8 100644 --- a/tripleoclient/v1/undercloud_config.py +++ b/tripleoclient/v1/undercloud_config.py @@ -592,12 +592,6 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True, '-e', os.path.join(tht_templates, 'environments/use-dns-for-vips.yaml') ] - # we want to load this environment after undercloud.yaml for precedence. - if CONF.get('container_cli', 'podman') == 'podman': - deploy_args += [ - '-e', os.path.join(tht_templates, 'environments/podman.yaml') - ] - # If a container images file is used, copy it into the tempdir to make it # later into other deployment artifacts and user-provided files. _container_images_config(CONF, deploy_args, env_data, tempdir)