diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml index 5995baea9..f148f1fed 100644 --- a/container-images/overcloud_containers.yaml +++ b/container-images/overcloud_containers.yaml @@ -106,14 +106,14 @@ container_images: - imagename: docker.io/ceph/daemon:v3.0.3-stable-3.0-luminous-centos-7-x86_64 - imagename: docker.io/tripleomaster/centos-binary-tempest:current-tripleo - imagename: docker.io/tripleomaster/centos-binary-rsyslog-base:current-tripleo -- imagename: docker.io/openshift/origin:v3.9.0 -- imagename: docker.io/openshift/node:v3.9.0 -- imagename: docker.io/openshift/origin-deployer:v3.9.0 -- imagename: docker.io/openshift/origin-docker-registry:v3.9.0 -- imagename: docker.io/openshift/origin-haproxy-router:v3.9.0 -- imagename: docker.io/openshift/origin-pod:v3.9.0 -- imagename: docker.io/openshift/origin-sti-builder:v3.9.0 -- imagename: docker.io/openshift/origin-web-console:v3.9.0 +- imagename: docker.io/openshift/origin:v3.10.0 +- imagename: docker.io/openshift/node:v3.10.0 +- imagename: docker.io/openshift/origin-deployer:v3.10.0 +- imagename: docker.io/openshift/origin-docker-registry:v3.10.0 +- imagename: docker.io/openshift/origin-haproxy-router:v3.10.0 +- imagename: docker.io/openshift/origin-pod:v3.10.0 +- imagename: docker.io/openshift/origin-sti-builder:v3.10.0 +- imagename: docker.io/openshift/origin-web-console:v3.10.0 - imagename: docker.io/cockpit/kubernetes:latest - imagename: registry.fedoraproject.org/latest/etcd:latest - imagename: docker.io/gluster/gluster-centos:latest diff --git a/tripleo_common/image/kolla_builder.py b/tripleo_common/image/kolla_builder.py index 8602a89b5..f5aebeed3 100644 --- a/tripleo_common/image/kolla_builder.py +++ b/tripleo_common/image/kolla_builder.py @@ -39,7 +39,7 @@ CONTAINER_IMAGE_PREPARE_PARAM = [{ 'tag': 'current-tripleo', 'neutron_driver': None, 'openshift_namespace': 'docker.io/openshift', - 'openshift_tag': 'v3.9.0', + 'openshift_tag': 'v3.10.0', 'openshift_base_image': 'origin', 'openshift_cockpit_namespace': 'docker.io/cockpit', 'openshift_cockpit_image': 'kubernetes', diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py index 7c8c8ab9d..a60d4e1bb 100644 --- a/tripleo_common/tests/image/test_kolla_builder.py +++ b/tripleo_common/tests/image/test_kolla_builder.py @@ -173,7 +173,7 @@ class TestKollaImageBuilderTemplate(base.TestCase): 'tag': 'current-tripleo', 'neutron_driver': None, 'openshift_namespace': 'docker.io/openshift', - 'openshift_tag': 'v3.9.0', + 'openshift_tag': 'v3.10.0', 'openshift_base_image': 'origin', 'openshift_cockpit_namespace': 'docker.io/cockpit', 'openshift_cockpit_image': 'kubernetes',