diff options
| author | Vadim Rutkovsky <vrutkovs@redhat.com> | 2018-01-25 15:10:32 +0100 |
|---|---|---|
| committer | Vadim Rutkovsky <vrutkovs@redhat.com> | 2018-01-29 11:02:21 +0100 |
| commit | a689ff21d50fd6a8d07fe99f552ac3371345b55f (patch) | |
| tree | c85f1e3bb1fb44ca0bda5fd81d3e779e129584e7 | |
| parent | 602fa687a2266dcb351492113654999a02c03faa (diff) | |
| download | openshift-a689ff21d50fd6a8d07fe99f552ac3371345b55f.tar.gz openshift-a689ff21d50fd6a8d07fe99f552ac3371345b55f.tar.bz2 openshift-a689ff21d50fd6a8d07fe99f552ac3371345b55f.tar.xz openshift-a689ff21d50fd6a8d07fe99f552ac3371345b55f.zip | |
Rework provisioners vars to support different prefix/version for Origin/OSE
| -rw-r--r-- | roles/openshift_provisioners/defaults/main.yaml | 10 | ||||
| -rw-r--r-- | roles/openshift_provisioners/tasks/main.yaml | 5 |
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 |