diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-15 20:08:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-15 20:08:06 -0800 |
| commit | 9df909053978f515ace83626755a78c163357ba2 (patch) | |
| tree | 925a069ddb7bde3ad7422a85f8cb505c4eafd246 /roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml | |
| parent | 6cfc4a162cff36bb2ba7bb482135060e76c5d5a1 (diff) | |
| parent | aea3fa16ecf72ea5657fa95d96558a7ebde9f66e (diff) | |
| download | openshift-9df909053978f515ace83626755a78c163357ba2.tar.gz openshift-9df909053978f515ace83626755a78c163357ba2.tar.bz2 openshift-9df909053978f515ace83626755a78c163357ba2.tar.xz openshift-9df909053978f515ace83626755a78c163357ba2.zip | |
Merge pull request #6037 from ewolinetz/logging_default_images
Automatic merge from submit-queue.
Updating logging components image defaulting pattern
Matches openshift_logging pattern and pattern used by other ansible components
Addresses:
https://bugzilla.redhat.com/show_bug.cgi?id=1505681
Diffstat (limited to 'roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml')
| -rw-r--r-- | roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml b/roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml index 2fd960bb5..07d92896f 100644 --- a/roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml +++ b/roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml @@ -1,3 +1,5 @@ --- +__openshift_logging_elasticsearch_image_prefix: "{{ openshift_logging_image_prefix | default('registry.access.redhat.com/openshift3/') }}" +__openshift_logging_elasticsearch_image_version: "{{ openshift_logging_image_version | default ('v3.7') }}" __openshift_logging_elasticsearch_proxy_image_prefix: "{{ openshift_logging_image_prefix | default('registry.access.redhat.com/openshift3/') }}" -__openshift_logging_elasticsearch_proxy_image_version: "v3.7" +__openshift_logging_elasticsearch_proxy_image_version: "{{ openshift_logging_image_version | default ('v3.7') }}" |