Additional images for openshift services
This commit adds missing images for openshift service catalog and
template service broker. These two services are enabled by default by
openshift-ansible and as a result, tripleo should deploy them in its
default setting too (they were explicitly disabled in tht until now).
Change-Id: Ic358ed27d63015d297f50c10f553fc1c470ea6a5
Partial-Bug: #1806353
(cherry picked from commit 9d53ff3771
)
This commit is contained in:
parent
6fc7e1bf73
commit
112cc3b525
|
@ -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: docker.io/tripleorocky
|
||||
openshift_cluster_monitoring_image: coreos-cluster-monitoring-operator
|
||||
openshift_cluster_monitoring_tag: v0.1.1
|
||||
|
|
|
@ -115,6 +115,9 @@ container_images:
|
|||
- imagename: docker.io/openshift/origin-haproxy-router:v3.11.0
|
||||
- imagename: docker.io/openshift/origin-node:v3.11.0
|
||||
- imagename: docker.io/openshift/origin-pod:v3.11.0
|
||||
- imagename: docker.io/openshift/origin-service-catalog:v3.11.0
|
||||
- imagename: docker.io/openshift/origin-template-service-broker:v3.11.0
|
||||
- imagename: docker.io/ansibleplaybookbundle/origin-ansible-service-broker:latest
|
||||
- imagename: docker.io/openshift/origin-web-console:v3.11.0
|
||||
- imagename: docker.io/cockpit/kubernetes:latest
|
||||
- imagename: registry.fedoraproject.org/latest/etcd:latest
|
||||
|
|
|
@ -858,6 +858,24 @@ container_images_template:
|
|||
- OS::TripleO::Services::OpenShift::Master
|
||||
- OS::TripleO::Services::OpenShift::Worker
|
||||
|
||||
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-service-catalog:{{openshift_tag}}"
|
||||
params:
|
||||
- DockerOpenShiftServiceCatalogImage
|
||||
services:
|
||||
- OS::TripleO::Services::OpenShift::Master
|
||||
|
||||
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-template-service-broker:{{openshift_tag}}"
|
||||
params:
|
||||
- DockerOpenShiftTemplateServiceBrokerImage
|
||||
services:
|
||||
- OS::TripleO::Services::OpenShift::Master
|
||||
|
||||
- imagename: "{{openshift_asb_namespace}}/{{openshift_prefix}}-ansible-service-broker:{{openshift_asb_tag}}"
|
||||
params:
|
||||
- DockerOpenShiftAnsibleServiceBrokerImage
|
||||
services:
|
||||
- OS::TripleO::Services::OpenShift::Infra
|
||||
|
||||
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-web-console:{{openshift_tag}}"
|
||||
params:
|
||||
- DockerOpenShiftWebConsoleImage
|
||||
|
|
|
@ -195,6 +195,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':
|
||||
'docker.io/tripleorocky',
|
||||
'openshift_cluster_monitoring_image':
|
||||
|
@ -262,6 +264,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':
|
||||
|
@ -322,6 +327,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-'
|
||||
|
|
Loading…
Reference in New Issue