openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Stop using deprecated docker.yaml"

This commit is contained in:
Zuul 2018-10-25 23:07:47 +00:00 committed by Gerrit Code Review
parent 643b222378 24255000c6
commit 709d0ca49f
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleoclient/tests/v1/test_container_image.py
View File

@ -214,7 +214,7 @@ class TestContainerImagePrepare(TestPluginV1):
'--set',
'ceph_tag=mytag',
'-e',
'environment/docker.yaml',
'environment/docker-ha.yaml',
'--roles-file',
roles_file,
'--modify-role',
@ -243,7 +243,7 @@ class TestContainerImagePrepare(TestPluginV1):
self.cmd.take_action(parsed_args)
pmef.assert_called_once_with(['environment/docker.yaml'],
pmef.assert_called_once_with(['environment/docker-ha.yaml'],
env_path_is_object=mock.ANY,
object_request=mock.ANY)
mock_cip.assert_called_once_with(

21
tripleoclient/tests/v1/undercloud/test_undercloud.py
View File

@ -73,8 +73,6 @@ class TestUndercloudInstall(TestPluginV1):
'--templates=/usr/share/openstack-tripleo-heat-templates/',
'--heat-native', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml',
@ -143,7 +141,6 @@ class TestUndercloudInstall(TestPluginV1):
'--templates=/usertht',
'--roles-file=foo/roles.yaml',
'--heat-native=False', '-e',
'/usertht/environments/docker.yaml', '-e',
'/usertht/environments/undercloud.yaml', '-e',
'/home/stack/foo.yaml', '-e',
'/usertht/environments/services/ironic.yaml', '-e',
@ -295,8 +292,6 @@ class TestUndercloudInstall(TestPluginV1):
'--templates=/usr/share/openstack-tripleo-heat-templates/',
'--heat-native', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/'
'environments/services/masquerade-networks.yaml',
@ -366,8 +361,6 @@ class TestUndercloudInstall(TestPluginV1):
'--templates=/usr/share/openstack-tripleo-heat-templates/',
'--heat-native', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml',
@ -430,8 +423,6 @@ class TestUndercloudInstall(TestPluginV1):
'--templates=/usr/share/openstack-tripleo-heat-templates/',
'--heat-native', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml',
@ -491,8 +482,6 @@ class TestUndercloudInstall(TestPluginV1):
'--templates=/usr/share/openstack-tripleo-heat-templates/',
'--heat-native', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml',
@ -571,8 +560,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'lifecycle/undercloud-upgrade-prepare.yaml',
'--heat-native', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml',
@ -635,8 +622,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'lifecycle/undercloud-upgrade-prepare.yaml',
'--heat-native', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml',
@ -698,8 +683,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'lifecycle/undercloud-upgrade-prepare.yaml',
'--heat-native', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml',
@ -761,8 +744,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'lifecycle/undercloud-upgrade-prepare.yaml',
'--heat-native', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml',
@ -828,8 +809,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'lifecycle/undercloud-upgrade-prepare.yaml',
'--heat-native', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml',

1
tripleoclient/v1/undercloud_config.py
View File

@ -367,7 +367,6 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
# These should be loaded first so we can override all the bits later
deploy_args += [
"-e", os.path.join(tht_templates, "environments/docker.yaml"),
"-e", os.path.join(tht_templates, "environments/undercloud.yaml")]
# If a container images file is used, copy it into the tempdir to make it