diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-09 02:45:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 02:45:52 -0800 |
| commit | 3ef7a209dde51c972d25c8ecfc019704ce056db7 (patch) | |
| tree | edb25069c7da9c8fc5f42e1321dbe3823ebc39bc /roles/ansible_service_broker | |
| parent | 15827bd85421fc8fe09487d06efc013292664147 (diff) | |
| parent | e6e8c13d7d65c81c287a5b53403866db8280a5bf (diff) | |
| download | openshift-3ef7a209dde51c972d25c8ecfc019704ce056db7.tar.gz openshift-3ef7a209dde51c972d25c8ecfc019704ce056db7.tar.bz2 openshift-3ef7a209dde51c972d25c8ecfc019704ce056db7.tar.xz openshift-3ef7a209dde51c972d25c8ecfc019704ce056db7.zip | |
Merge pull request #6712 from vrutkovs/avoid-hardcoding-image-version
Automatic merge from submit-queue.
Set default image to openshift_release
Previously `v3.7` was hardcoded as a default value, instead `openshift_release` should be used.
A new var is introduced - `openshift_template_service_broker_image_tag`, similar to vars for other services.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1530183
TODO:
* [x] Make sure all images have a variable for image prefix
* [x] Figure out if `latest` is a good default for origin images
* [ ] Set correct `openshift_image_tag` in CI inventory for tests to pass
Diffstat (limited to 'roles/ansible_service_broker')
| -rw-r--r-- | roles/ansible_service_broker/vars/openshift-enterprise.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/ansible_service_broker/vars/openshift-enterprise.yml b/roles/ansible_service_broker/vars/openshift-enterprise.yml index c203f596e..15a7e5477 100644 --- a/roles/ansible_service_broker/vars/openshift-enterprise.yml +++ b/roles/ansible_service_broker/vars/openshift-enterprise.yml @@ -1,7 +1,7 @@ --- __ansible_service_broker_image_prefix: registry.access.redhat.com/openshift3/ose- -__ansible_service_broker_image_tag: v3.7 +__ansible_service_broker_image_tag: "{{ openshift_image_tag }}" __ansible_service_broker_etcd_image_prefix: registry.access.redhat.com/rhel7/ __ansible_service_broker_etcd_image_tag: latest @@ -14,6 +14,6 @@ __ansible_service_broker_registry_url: "https://registry.access.redhat.com" __ansible_service_broker_registry_user: null __ansible_service_broker_registry_password: null __ansible_service_broker_registry_organization: null -__ansible_service_broker_registry_tag: v3.7 +__ansible_service_broker_registry_tag: "{{ openshift_image_tag }}" __ansible_service_broker_registry_whitelist: - '.*-apb$' |