summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-31 00:35:54 -0800
committerGitHub <noreply@github.com>2018-01-31 00:35:54 -0800
commit26430dcbbbba6ac31e4f0380f12871c3e083c104 (patch)
tree45d388d6bd3829948fd3b7ec342ce3fbbb3a690c
parent2bdb52532bbbc678e240739fc42b7ea2ee71c876 (diff)
parenta689ff21d50fd6a8d07fe99f552ac3371345b55f (diff)
downloadopenshift-26430dcbbbba6ac31e4f0380f12871c3e083c104.tar.gz
openshift-26430dcbbbba6ac31e4f0380f12871c3e083c104.tar.bz2
openshift-26430dcbbbba6ac31e4f0380f12871c3e083c104.tar.xz
openshift-26430dcbbbba6ac31e4f0380f12871c3e083c104.zip
Merge pull request #6868 from vrutkovs/prefix-provisioner-pod
Automatic merge from submit-queue. Rework provisioners vars to support different prefix/version for Origin/OSE Fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=1523534 Obsoletes https://github.com/openshift/openshift-ansible/pull/6396
-rw-r--r--roles/openshift_provisioners/defaults/main.yaml10
-rw-r--r--roles/openshift_provisioners/tasks/main.yaml5
2 files changed, 13 insertions, 2 deletions
diff --git a/roles/openshift_provisioners/defaults/main.yaml b/roles/openshift_provisioners/defaults/main.yaml
index a6f040831..34ba78404 100644
--- a/roles/openshift_provisioners/defaults/main.yaml
+++ b/roles/openshift_provisioners/defaults/main.yaml
@@ -1,7 +1,5 @@
---
openshift_provisioners_install_provisioners: True
-openshift_provisioners_image_prefix: docker.io/openshift/origin-
-openshift_provisioners_image_version: latest
openshift_provisioners_efs: False
openshift_provisioners_efs_path: /persistentvolumes
@@ -10,3 +8,11 @@ openshift_provisioners_efs_nodeselector: ""
openshift_provisioners_efs_supplementalgroup: '65534'
openshift_provisioners_project: openshift-infra
+
+openshift_provisioners_image_prefix_dict:
+ origin: "docker.io/openshift/origin-"
+ openshift-enterprise: "registry.access.redhat.com/openshift3/ose-"
+
+openshift_provisioners_image_version_dict:
+ origin: "latest"
+ openshift-enterprise: "{{ openshift_image_tag }}"
diff --git a/roles/openshift_provisioners/tasks/main.yaml b/roles/openshift_provisioners/tasks/main.yaml
index 4ba26b2b8..d00573b07 100644
--- a/roles/openshift_provisioners/tasks/main.yaml
+++ b/roles/openshift_provisioners/tasks/main.yaml
@@ -12,6 +12,11 @@
check_mode: no
tags: provisioners_init
+- name: Set eventrouter image facts
+ set_fact:
+ openshift_provisioners_image_prefix: "{{ openshift_provisioners_image_prefix | default(openshift_provisioners_image_prefix_dict[openshift_deployment_type]) }}"
+ openshift_provisioners_image_version: "{{ openshift_provisioners_image_version | default(openshift_provisioners_image_version_dict[openshift_deployment_type]) }}"
+
- include_tasks: install_provisioners.yaml
when: openshift_provisioners_install_provisioners | default(false) | bool