Browse Source

Merge pull request #7414 from ewolinetz/fix_default_image_tags

Aligning version defaults for logging components
OpenShift Merge Robot 7 years ago
parent
commit
7c726db393

+ 1 - 1
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_image_version: "{{ openshift_logging_image_version | default(openshift_image_tag) }}"
 __openshift_logging_elasticsearch_proxy_image_prefix: "{{ openshift_logging_image_prefix | default('docker.io/openshift/') }}"
 __openshift_logging_elasticsearch_proxy_image_version: "{{ openshift_logging_image_version | default('v1.0.0') }}"

+ 1 - 1
roles/openshift_logging_eventrouter/vars/default_images.yml

@@ -1,3 +1,3 @@
 ---
 __openshift_logging_eventrouter_image_prefix: "{{ openshift_logging_image_prefix | default('docker.io/openshift/origin-') }}"
-__openshift_logging_eventrouter_image_version: "{{ openshift_logging_image_version | default('latest') }}"
+__openshift_logging_eventrouter_image_version: "{{ openshift_logging_image_version | default(openshift_image_tag) }}"

+ 1 - 1
roles/openshift_logging_fluentd/vars/default_images.yml

@@ -1,3 +1,3 @@
 ---
 __openshift_logging_fluentd_image_prefix: "{{ openshift_logging_image_prefix | default('docker.io/openshift/origin-') }}"
-__openshift_logging_fluentd_image_version: "{{ openshift_logging_image_version | default('latest') }}"
+__openshift_logging_fluentd_image_version: "{{ openshift_logging_image_version | default(openshift_image_tag) }}"

+ 2 - 2
roles/openshift_logging_kibana/vars/default_images.yml

@@ -1,5 +1,5 @@
 ---
 __openshift_logging_kibana_image_prefix: "{{ openshift_logging_image_prefix | default('docker.io/openshift/origin-') }}"
-__openshift_logging_kibana_image_version: "{{ openshift_logging_image_version | default('latest') }}"
+__openshift_logging_kibana_image_version: "{{ openshift_logging_image_version | default(openshift_image_tag) }}"
 __openshift_logging_kibana_proxy_image_prefix: "{{ openshift_logging_image_prefix | default('docker.io/openshift/origin-') }}"
-__openshift_logging_kibana_proxy_image_version: "{{ openshift_logging_image_version | default('latest') }}"
+__openshift_logging_kibana_proxy_image_version: "{{ openshift_logging_image_version | default(openshift_image_tag) }}"

+ 1 - 1
roles/openshift_logging_mux/vars/default_images.yml

@@ -1,3 +1,3 @@
 ---
 __openshift_logging_mux_image_prefix: "{{ openshift_logging_image_prefix | default('docker.io/openshift/origin-') }}"
-__openshift_logging_mux_image_version: "{{ openshift_logging_image_version | default('latest') }}"
+__openshift_logging_mux_image_version: "{{ openshift_logging_image_version | default(openshift_image_tag) }}"