Convert Docker*Image parameters
This converts all Docker*Image parameter varients into Container*Image varients. The commit was autogenerated with the following sed command: sed -e "s|Docker\([^ ]*Image\)|Container\1|g" -i overcloud_containers.yaml.j2 Depends-On: Iab06efa5616975b99aa5772a65b415629f8d7882 Change-Id: I1aafd5ce765e7f4f4c15701f5197ae5c48c3b7a1
This commit is contained in:
Dan Prince
Alex Schultz
parent
d46a9fb18e
commit
709f3b4d7e
File diff suppressed because it is too large
Load Diff
|
|
@ -28,10 +28,10 @@ from tripleo_common.tests import base
|
|||
|
||||
image_entries = [{
|
||||
'imagename': 't/cb-nova-compute:liberty',
|
||||
'params': ['DockerNovaComputeImage', 'DockerNovaLibvirtConfigImage']
|
||||
'params': ['ContainerNovaComputeImage', 'ContainerNovaLibvirtConfigImage']
|
||||
}, {
|
||||
'imagename': 't/cb-nova-libvirt:liberty',
|
||||
'params': ['DockerNovaLibvirtImage']
|
||||
'params': ['ContainerNovaLibvirtImage']
|
||||
}]
|
||||
|
||||
|
||||
|
|
@ -66,9 +66,9 @@ class PrepareContainerImageEnvTest(base.TestCase):
|
|||
'container-images', 'overcloud_containers.yaml.j2')]
|
||||
)
|
||||
params = {
|
||||
'DockerNovaComputeImage': 't/cb-nova-compute:liberty',
|
||||
'DockerNovaLibvirtConfigImage': 't/cb-nova-compute:liberty',
|
||||
'DockerNovaLibvirtImage': 't/cb-nova-libvirt:liberty',
|
||||
'ContainerNovaComputeImage': 't/cb-nova-compute:liberty',
|
||||
'ContainerNovaLibvirtConfigImage': 't/cb-nova-compute:liberty',
|
||||
'ContainerNovaLibvirtImage': 't/cb-nova-libvirt:liberty',
|
||||
}
|
||||
expected_env = yaml.safe_dump(
|
||||
{'parameter_defaults': params},
|
||||
|
|
@ -151,9 +151,9 @@ class PrepareContainerImageParametersTest(base.TestCase):
|
|||
]}
|
||||
image_params = {
|
||||
'FooContainerImage': '192.0.2.1/foo/image',
|
||||
'DockerNovaComputeImage': 't/cb-nova-compute:liberty',
|
||||
'DockerNovaLibvirtConfigImage': 't/cb-nova-compute:liberty',
|
||||
'DockerNovaLibvirtImage': 't/cb-nova-libvirt:liberty',
|
||||
'ContainerNovaComputeImage': 't/cb-nova-compute:liberty',
|
||||
'ContainerNovaLibvirtConfigImage': 't/cb-nova-compute:liberty',
|
||||
'ContainerNovaLibvirtImage': 't/cb-nova-libvirt:liberty',
|
||||
}
|
||||
image_env_contents = yaml.safe_dump(
|
||||
{'parameter_defaults': image_params},
|
||||
|
|
|
|||
|
|
@ -638,9 +638,10 @@ class TestPrepare(base.TestCase):
|
|||
'imagename': '192.0.2.0:8787/t/p-nova-compute:l'}
|
||||
],
|
||||
'environments/containers-default-parameters.yaml': {
|
||||
'DockerNovaComputeImage': '192.0.2.0:8787/t/p-nova-compute:l',
|
||||
'DockerNovaLibvirtConfigImage': '192.0.2.0:8787/t/'
|
||||
'p-nova-compute:l'
|
||||
'ContainerNovaComputeImage':
|
||||
'192.0.2.0:8787/t/p-nova-compute:l',
|
||||
'ContainerNovaLibvirtConfigImage':
|
||||
'192.0.2.0:8787/t/p-nova-compute:l'
|
||||
}},
|
||||
kb.container_images_prepare(
|
||||
template_file=TEMPLATE_PATH,
|
||||
|
|
@ -665,7 +666,8 @@ class TestPrepare(base.TestCase):
|
|||
'imagename': '192.0.2.0:8787/t/p-nova-libvirt:l'}
|
||||
],
|
||||
'environments/containers-default-parameters.yaml': {
|
||||
'DockerNovaLibvirtImage': '192.0.2.0:8787/t/p-nova-libvirt:l'
|
||||
'ContainerNovaLibvirtImage':
|
||||
'192.0.2.0:8787/t/p-nova-libvirt:l'
|
||||
}},
|
||||
kb.container_images_prepare(
|
||||
template_file=TEMPLATE_PATH,
|
||||
|
|
@ -690,7 +692,8 @@ class TestPrepare(base.TestCase):
|
|||
'imagename': '192.0.2.0:8787/t/p-nova-libvirt:l'}
|
||||
],
|
||||
'environments/containers-default-parameters.yaml': {
|
||||
'DockerNovaLibvirtImage': '192.0.2.0:8787/t/p-nova-libvirt:l'
|
||||
'ContainerNovaLibvirtImage':
|
||||
'192.0.2.0:8787/t/p-nova-libvirt:l'
|
||||
}},
|
||||
kb.container_images_prepare(
|
||||
template_file=TEMPLATE_PATH,
|
||||
|
|
@ -716,13 +719,13 @@ class TestPrepare(base.TestCase):
|
|||
'push_destination': '192.0.2.0:8787',
|
||||
}],
|
||||
'environments/containers-default-parameters.yaml': {
|
||||
'DockerNovaApiImage':
|
||||
'ContainerNovaApiImage':
|
||||
'192.0.2.0:8787/t/p-nova-api:l',
|
||||
'DockerNovaConfigImage':
|
||||
'ContainerNovaConfigImage':
|
||||
'192.0.2.0:8787/t/p-nova-api:l',
|
||||
'DockerNovaMetadataConfigImage':
|
||||
'ContainerNovaMetadataConfigImage':
|
||||
u'192.0.2.0:8787/t/p-nova-api:l',
|
||||
'DockerNovaMetadataImage':
|
||||
'ContainerNovaMetadataImage':
|
||||
'192.0.2.0:8787/t/p-nova-api:l'
|
||||
}},
|
||||
kb.container_images_prepare(
|
||||
|
|
@ -751,13 +754,13 @@ class TestPrepare(base.TestCase):
|
|||
'push_destination': '192.0.2.0:8787',
|
||||
}],
|
||||
'environments/containers-default-parameters.yaml': {
|
||||
'DockerNovaApiImage':
|
||||
'ContainerNovaApiImage':
|
||||
'192.0.2.0:8787/t/p-nova-api:l',
|
||||
'DockerNovaConfigImage':
|
||||
'ContainerNovaConfigImage':
|
||||
'192.0.2.0:8787/t/p-nova-api:l',
|
||||
'DockerNovaMetadataConfigImage':
|
||||
'ContainerNovaMetadataConfigImage':
|
||||
u'192.0.2.0:8787/t/p-nova-api:l',
|
||||
'DockerNovaMetadataImage':
|
||||
'ContainerNovaMetadataImage':
|
||||
'192.0.2.0:8787/t/p-nova-api:l'
|
||||
}},
|
||||
kb.container_images_prepare(
|
||||
|
|
@ -783,7 +786,7 @@ class TestPrepare(base.TestCase):
|
|||
'imagename': '192.0.2.0:8787/t/ceph:l',
|
||||
}],
|
||||
'environments/containers-default-parameters.yaml': {
|
||||
'DockerCephDaemonImage': '192.0.2.0:8787/t/ceph:l'
|
||||
'ContainerCephDaemonImage': '192.0.2.0:8787/t/ceph:l'
|
||||
}},
|
||||
kb.container_images_prepare(
|
||||
template_file=TEMPLATE_PATH,
|
||||
|
|
@ -806,8 +809,8 @@ class TestPrepare(base.TestCase):
|
|||
'imagename': 't/p-neutron-server:l'}
|
||||
],
|
||||
'environments/containers-default-parameters.yaml': {
|
||||
'DockerNeutronApiImage': 't/p-neutron-server:l',
|
||||
'DockerNeutronConfigImage': 't/p-neutron-server:l'
|
||||
'ContainerNeutronApiImage': 't/p-neutron-server:l',
|
||||
'ContainerNeutronConfigImage': 't/p-neutron-server:l'
|
||||
}},
|
||||
kb.container_images_prepare(
|
||||
template_file=TEMPLATE_PATH,
|
||||
|
|
@ -836,10 +839,10 @@ class TestPrepare(base.TestCase):
|
|||
'imagename': 't/p-ovn-controller:l'}
|
||||
],
|
||||
'environments/containers-default-parameters.yaml': {
|
||||
'DockerNeutronApiImage': 't/p-neutron-server-ovn:l',
|
||||
'DockerNeutronConfigImage': 't/p-neutron-server-ovn:l',
|
||||
'DockerOvnControllerConfigImage': 't/p-ovn-controller:l',
|
||||
'DockerOvnControllerImage': 't/p-ovn-controller:l'
|
||||
'ContainerNeutronApiImage': 't/p-neutron-server-ovn:l',
|
||||
'ContainerNeutronConfigImage': 't/p-neutron-server-ovn:l',
|
||||
'ContainerOvnControllerConfigImage': 't/p-ovn-controller:l',
|
||||
'ContainerOvnControllerImage': 't/p-ovn-controller:l'
|
||||
}},
|
||||
kb.container_images_prepare(
|
||||
template_file=TEMPLATE_PATH,
|
||||
|
|
@ -869,10 +872,11 @@ class TestPrepare(base.TestCase):
|
|||
'imagename': 't/opendaylight:l'}
|
||||
],
|
||||
'environments/containers-default-parameters.yaml': {
|
||||
'DockerNeutronApiImage': 't/neutron-server-opendaylight:l',
|
||||
'DockerNeutronConfigImage': 't/neutron-server-opendaylight:l',
|
||||
'DockerOpendaylightApiImage': 't/opendaylight:l',
|
||||
'DockerOpendaylightConfigImage': 't/opendaylight:l',
|
||||
'ContainerNeutronApiImage': 't/neutron-server-opendaylight:l',
|
||||
'ContainerNeutronConfigImage':
|
||||
't/neutron-server-opendaylight:l',
|
||||
'ContainerOpendaylightApiImage': 't/opendaylight:l',
|
||||
'ContainerOpendaylightConfigImage': 't/opendaylight:l',
|
||||
}},
|
||||
kb.container_images_prepare(
|
||||
template_file=TEMPLATE_PATH,
|
||||
|
|
|
|||
Loading…
Reference in New Issue