openstack
/
python-tripleoclient
Code Issues Proposed changes

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
This commit is contained in:
Sandeep Yadav 2021-04-12 08:06:58 +00:00 committed by James Slagle
parent a447a5fbbd
commit 292a871064
4 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tripleoclient/tests/v1/undercloud/minion/test_config.py
View File

@ -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',

31
tripleoclient/tests/v1/undercloud/test_install_upgrade.py
View File

@ -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/'
@ -151,7 +150,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',
@ -308,8 +306,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',
@ -376,8 +373,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/'
@ -437,8 +433,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/'
@ -495,8 +490,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/'
@ -643,8 +637,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/'
@ -708,8 +701,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/'
@ -772,8 +764,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/'
@ -834,8 +825,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/'
@ -902,8 +892,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/'

5
tripleoclient/v1/minion_config.py
View File

@ -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)

6
tripleoclient/v1/undercloud_config.py
View File

@ -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)