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 /inventory/hosts.example | |
| 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 'inventory/hosts.example')
| -rw-r--r-- | inventory/hosts.example | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/inventory/hosts.example b/inventory/hosts.example index 82c588100..b2237df3c 100644 --- a/inventory/hosts.example +++ b/inventory/hosts.example @@ -934,6 +934,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Force a specific image version to use when pulling the service catalog image #openshift_service_catalog_image_version=v3.7 +# TSB image tag +#template_service_broker_version='v3.7' + # Configure one of more namespaces whose templates will be served by the TSB #openshift_template_service_broker_namespaces=['openshift'] |