diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-11-07 11:09:28 -0600 |
|---|---|---|
| committer | Eric Wolinetz <ewolinet@redhat.com> | 2017-11-07 11:09:28 -0600 |
| commit | 72ee721762eea748b762a9474a137947158762df (patch) | |
| tree | 58e2a96a1aba6294e69ad2f2870340daf99a4f93 /roles/openshift_logging_elasticsearch | |
| parent | 6575595891f71e7d9b9ac929b9ba58117a65e17b (diff) | |
| download | openshift-72ee721762eea748b762a9474a137947158762df.tar.gz openshift-72ee721762eea748b762a9474a137947158762df.tar.bz2 openshift-72ee721762eea748b762a9474a137947158762df.tar.xz openshift-72ee721762eea748b762a9474a137947158762df.zip | |
Addressing comments
Diffstat (limited to 'roles/openshift_logging_elasticsearch')
| -rw-r--r-- | roles/openshift_logging_elasticsearch/vars/default_images.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_logging_elasticsearch/vars/default_images.yml b/roles/openshift_logging_elasticsearch/vars/default_images.yml index d38758324..f74731bc4 100644 --- a/roles/openshift_logging_elasticsearch/vars/default_images.yml +++ b/roles/openshift_logging_elasticsearch/vars/default_images.yml @@ -1,5 +1,5 @@ --- __openshift_logging_elasticsearch_image_prefix: "{{ openshift_logging_image_prefix | default('docker.io/openshift/origin-') }}" __openshift_logging_elasticsearch_image_version: "{{ openshift_logging_image_version | default('latest') }}" -__openshift_logging_elasticsearch_proxy_image_prefix: "{{ openshift_logging_image_prefix | default('docker.io/openshift/origin-') | regex_replace('$(.*)/origin-', '\\1/') }}" -__openshift_logging_elasticsearch_proxy_image_version: "v1.0.0" +__openshift_logging_elasticsearch_proxy_image_prefix: "{{ openshift_logging_image_prefix | default('docker.io/openshift/origin-') | regex_replace('^(.*)/origin-$', '\\1/') }}" +__openshift_logging_elasticsearch_proxy_image_version: "{{ openshift_logging_image_version | default('v1.0.0') }}" diff --git a/roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml b/roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml index f807c94e0..07d92896f 100644 --- a/roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml +++ b/roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml @@ -2,4 +2,4 @@ __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') }}" |