diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-11-06 15:53:55 -0600 |
|---|---|---|
| committer | Eric Wolinetz <ewolinet@redhat.com> | 2017-11-06 15:56:54 -0600 |
| commit | 6575595891f71e7d9b9ac929b9ba58117a65e17b (patch) | |
| tree | ab67b815c16d300296d6c751a25daeb1a824d8c6 /roles/openshift_logging_elasticsearch/vars | |
| parent | 9e5462826beb7bece09e55b20f3fe47a65c8b44c (diff) | |
| download | openshift-6575595891f71e7d9b9ac929b9ba58117a65e17b.tar.gz openshift-6575595891f71e7d9b9ac929b9ba58117a65e17b.tar.bz2 openshift-6575595891f71e7d9b9ac929b9ba58117a65e17b.tar.xz openshift-6575595891f71e7d9b9ac929b9ba58117a65e17b.zip | |
Updating logging components image defaulting pattern to match openshift_logging pattern
Diffstat (limited to 'roles/openshift_logging_elasticsearch/vars')
| -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, 5 insertions, 1 deletions
diff --git a/roles/openshift_logging_elasticsearch/vars/default_images.yml b/roles/openshift_logging_elasticsearch/vars/default_images.yml index b7d105caf..d38758324 100644 --- a/roles/openshift_logging_elasticsearch/vars/default_images.yml +++ b/roles/openshift_logging_elasticsearch/vars/default_images.yml @@ -1,3 +1,5 @@ --- -__openshift_logging_elasticsearch_proxy_image_prefix: "docker.io/openshift/" +__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" diff --git a/roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml b/roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml index 2fd960bb5..f807c94e0 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" |