openstack/python-tripleoclient
Code Issues Proposed changes

Merge "undercloud: load podman environment when enabled"

Browse Source
This commit is contained in:
Zuul 2019-01-17 13:45:38 +00:00 committed by Gerrit Code Review
commit f0f1bc1269
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,9 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', 'undercloud.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e', '/home/stack/foo.yaml', '-e', 'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml', 'services/ironic.yaml',
'-e', '-e',
@ -147,6 +149,7 @@ class TestUndercloudInstall(TestPluginV1):
'--heat-native=False', '-e', '--heat-native=False', '-e',
'/usertht/environments/undercloud.yaml', '-e', '/usertht/environments/undercloud.yaml', '-e',
'/usertht/environments/use-dns-for-vips.yaml', '-e', '/usertht/environments/use-dns-for-vips.yaml', '-e',
'/usertht/environments/podman.yaml', '-e',
'/home/stack/foo.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usertht/environments/services/ironic.yaml', '-e', '/usertht/environments/services/ironic.yaml', '-e',
'/usertht/environments/services/ironic-inspector.yaml', '-e', '/usertht/environments/services/ironic-inspector.yaml', '-e',
@ -299,7 +302,9 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', 'undercloud.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e', '/home/stack/foo.yaml', '-e', 'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/' '/usr/share/openstack-tripleo-heat-templates/'
'environments/services/masquerade-networks.yaml', 'environments/services/masquerade-networks.yaml',
'-e', '-e',
@ -368,7 +373,9 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', 'undercloud.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e', '/home/stack/foo.yaml', '-e', 'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml', 'services/ironic.yaml',
'-e', '-e',
@ -430,7 +437,9 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', 'undercloud.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e', '/home/stack/foo.yaml', '-e', 'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml', 'services/ironic.yaml',
'-e', '-e',
@ -489,7 +498,9 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', 'undercloud.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e', '/home/stack/foo.yaml', '-e', 'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml', 'services/ironic.yaml',
'-e', '-e',
@ -570,7 +581,9 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', 'undercloud.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e', '/home/stack/foo.yaml', '-e', 'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml', 'services/ironic.yaml',
'-e', '-e',
@ -632,7 +645,9 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', 'undercloud.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e', '/home/stack/foo.yaml', '-e', 'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml', 'services/ironic.yaml',
'-e', '-e',
@ -693,7 +708,9 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', 'undercloud.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e', '/home/stack/foo.yaml', '-e', 'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml', 'services/ironic.yaml',
'-e', '-e',
@ -754,7 +771,9 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', 'undercloud.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e', '/home/stack/foo.yaml', '-e', 'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml', 'services/ironic.yaml',
'-e', '-e',
@ -819,7 +838,9 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', 'undercloud.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e', '/home/stack/foo.yaml', '-e', 'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml', 'services/ironic.yaml',
'-e', '-e',

6
tripleoclient/v1/undercloud_config.py
View File

@ -457,6 +457,12 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
'-e', os.path.join(tht_templates, 'environments/use-dns-for-vips.yaml') '-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 # If a container images file is used, copy it into the tempdir to make it
# later into other deployment artifacts and user-provided files. # later into other deployment artifacts and user-provided files.
_container_images_config(CONF, deploy_args, env_data, tempdir) _container_images_config(CONF, deploy_args, env_data, tempdir)