openstack/tripleo-common
Code Issues Proposed changes

Merge "Add container images for CNS"

Browse Source
This commit is contained in:
Zuul 2018-08-06 06:51:05 +00:00 committed by Gerrit Code Review
commit c11523bdbf
4 changed files with 56 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
container-images/overcloud_containers.yaml
View File

@ -116,3 +116,6 @@ container_images:
- imagename: docker.io/openshift/origin-web-console:v3.9.0
- imagename: docker.io/cockpit/kubernetes:latest
- imagename: registry.fedoraproject.org/latest/etcd:latest
- imagename: docker.io/gluster/gluster-centos:latest
- imagename: docker.io/gluster/glusterblock-provisioner:latest
- imagename: docker.io/heketi/heketi:latest

18
container-images/overcloud_containers.yaml.j2
View File

@ -859,3 +859,21 @@ container_images_template:
- DockerOpenShiftEtcdImage
services:
- OS::TripleO::Services::OpenShift::Master
- imagename: "{{openshift_gluster_namespace}}/{{openshift_gluster_image}}:{{openshift_gluster_tag}}"
params:
- DockerOpenShiftGlusterFSImage
services:
- OS::TripleO::Services::OpenShift::GlusterFS
- imagename: "{{openshift_gluster_namespace}}/{{openshift_gluster_block_image}}:{{openshift_gluster_tag}}"
params:
- DockerOpenShiftGlusterFSBlockImage
services:
- OS::TripleO::Services::OpenShift::GlusterFS
- imagename: "{{openshift_heketi_namespace}}/{{openshift_heketi_image}}:{{openshift_heketi_tag}}"
params:
- DockerOpenShiftGlusterFSHeketiImage
services:
- OS::TripleO::Services::OpenShift::GlusterFS

7
tripleo_common/image/kolla_builder.py
View File

@ -47,6 +47,13 @@ CONTAINER_IMAGE_PREPARE_PARAM = [{
'openshift_etcd_namespace': 'registry.fedoraproject.org/latest',
'openshift_etcd_image': 'etcd',
'openshift_etcd_tag': 'latest',
'openshift_gluster_namespace': 'docker.io/gluster',
'openshift_gluster_image': 'gluster-centos',
'openshift_gluster_block_image': 'glusterblock-provisioner',
'openshift_gluster_tag': 'latest',
'openshift_heketi_namespace': 'docker.io/heketi',
'openshift_heketi_image': 'heketi',
'openshift_heketi_tag': 'latest',
}
}]

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

@ -182,6 +182,13 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'/latest',
'openshift_etcd_image': 'etcd',
'openshift_etcd_tag': 'latest',
'openshift_gluster_namespace': 'docker.io/gluster',
'openshift_gluster_image': 'gluster-centos',
'openshift_gluster_block_image': 'glusterblock-provisioner',
'openshift_gluster_tag': 'latest',
'openshift_heketi_namespace': 'docker.io/heketi',
'openshift_heketi_image': 'heketi',
'openshift_heketi_tag': 'latest',
},
builder.container_images_template_inputs()
)
@ -201,10 +208,20 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'openshift_base_image': 'ose',
'openshift_cockpit_namespace': 'docker.io/openshift-cockpit',
'openshift_cockpit_image': 'cockpit',
'openshift_cockpit_tag': 'tag',
'openshift_cockpit_tag': 'cockpit-tag',
'openshift_etcd_namespace': 'registry.access.redhat.com/rhel7',
'openshift_etcd_image': 'openshift-etcd',
'openshift_etcd_tag': 'tag',
'openshift_etcd_tag': 'etcd-tag',
'openshift_gluster_namespace':
'registry.access.redhat.com/rhgs3',
'openshift_gluster_image': 'rhgs-server-rhel7',
'openshift_gluster_block_image':
'rhgs-gluster-block-prov-rhel7',
'openshift_gluster_tag': 'gluster-tag',
'openshift_heketi_namespace':
'registry.access.redhat.com/rhgs3',
'openshift_heketi_image': 'rhgs-volmanager-rhel7',
'openshift_heketi_tag': 'heketi-tag',
},
builder.container_images_template_inputs(
namespace='192.0.2.0:5000/tripleomaster',
@ -220,10 +237,17 @@ class TestKollaImageBuilderTemplate(base.TestCase):
openshift_base_image='ose',
openshift_cockpit_namespace='docker.io/openshift-cockpit',
openshift_cockpit_image='cockpit',
openshift_cockpit_tag='tag',
openshift_cockpit_tag='cockpit-tag',
openshift_etcd_namespace='registry.access.redhat.com/rhel7',
openshift_etcd_image='openshift-etcd',
openshift_etcd_tag='tag',
openshift_etcd_tag='etcd-tag',
openshift_gluster_namespace='registry.access.redhat.com/rhgs3',
openshift_gluster_image='rhgs-server-rhel7',
openshift_gluster_block_image='rhgs-gluster-block-prov-rhel7',
openshift_gluster_tag='gluster-tag',
openshift_heketi_namespace='registry.access.redhat.com/rhgs3',
openshift_heketi_image='rhgs-volmanager-rhel7',
openshift_heketi_tag='heketi-tag',
)
)