openstack/tripleo-common
Code Issues Proposed changes

Switch to openshift 3.10

Browse Source 
This updates the default tags for OpenShift images to v3.10.0.

Change-Id: Ied55e1713bf2803b17041c35e51d4e2d914dd302
Depends-On: I4f8127a9e2d822057f3db8f0974ab1db0698985a
This commit is contained in:
Martin André
2018-08-27 17:33:23 +02:00
parent 9fe037156f
commit d9e27e7826
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
container-images/overcloud_containers.yaml
View File

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

2
tripleo_common/image/kolla_builder.py
View File

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

2
tripleo_common/tests/image/test_kolla_builder.py
View File

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