Merge "Additional images for openshift services"

This commit is contained in:
Zuul 2019-01-04 13:29:53 +00:00 committed by Gerrit Code Review
commit c9e5e4979b
4 changed files with 37 additions and 0 deletions

View File

@ -47,6 +47,8 @@ parameter_defaults:
openshift_heketi_namespace: docker.io/heketi
openshift_heketi_image: heketi
openshift_heketi_tag: latest
openshift_asb_namespace: docker.io/ansibleplaybookbundle
openshift_asb_tag: latest
openshift_cluster_monitoring_namespace: quay.io/coreos
openshift_cluster_monitoring_image: cluster-monitoring-operator
openshift_cluster_monitoring_tag: v0.1.1

View File

@ -237,6 +237,12 @@ container_images:
image_source: openshift
- imagename: docker.io/openshift/origin-pod:v3.11.0
image_source: openshift
- imagename: docker.io/openshift/origin-service-catalog:v3.11.0
image_source: openshift
- imagename: docker.io/openshift/origin-template-service-broker:v3.11.0
image_source: openshift
- imagename: docker.io/ansibleplaybookbundle/origin-ansible-service-broker:latest
image_source: openshift
- imagename: docker.io/openshift/origin-web-console:v3.11.0
image_source: openshift
- imagename: docker.io/cockpit/kubernetes:latest

View File

@ -999,6 +999,27 @@ container_images_template:
- OS::TripleO::Services::OpenShift::Master
- OS::TripleO::Services::OpenShift::Worker
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-service-catalog:{{openshift_tag}}"
image_source: openshift
params:
- DockerOpenShiftServiceCatalogImage
services:
- OS::TripleO::Services::OpenShift::Master
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-template-service-broker:{{openshift_tag}}"
image_source: openshift
params:
- DockerOpenShiftTemplateServiceBrokerImage
services:
- OS::TripleO::Services::OpenShift::Master
- imagename: "{{openshift_asb_namespace}}/{{openshift_prefix}}-ansible-service-broker:{{openshift_asb_tag}}"
image_source: openshift
params:
- DockerOpenShiftAnsibleServiceBrokerImage
services:
- OS::TripleO::Services::OpenShift::Infra
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-web-console:{{openshift_tag}}"
image_source: openshift
params:

View File

@ -233,6 +233,8 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'openshift_heketi_namespace': 'docker.io/heketi',
'openshift_heketi_image': 'heketi',
'openshift_heketi_tag': 'latest',
'openshift_asb_namespace': 'docker.io/ansibleplaybookbundle',
'openshift_asb_tag': 'latest',
'openshift_cluster_monitoring_namespace': 'quay.io/coreos',
'openshift_cluster_monitoring_image':
'cluster-monitoring-operator',
@ -293,6 +295,9 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'registry.access.redhat.com/rhgs3',
'openshift_heketi_image': 'rhgs-volmanager-rhel7',
'openshift_heketi_tag': 'heketi-tag',
'openshift_asb_namespace':
'registry.access.redhat.com/openshift3',
'openshift_asb_tag': 'v3.11',
'openshift_cluster_monitoring_namespace':
'registry.access.redhat.com/openshift3',
'openshift_cluster_monitoring_image':
@ -353,6 +358,9 @@ class TestKollaImageBuilderTemplate(base.TestCase):
openshift_heketi_namespace='registry.access.redhat.com/rhgs3',
openshift_heketi_image='rhgs-volmanager-rhel7',
openshift_heketi_tag='heketi-tag',
openshift_asb_namespace='registry.'
'access.redhat.com/openshift3',
openshift_asb_tag='v3.11',
openshift_cluster_monitoring_namespace='registry.'
'access.redhat.com/openshift3',
openshift_cluster_monitoring_image='ose-'