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

2 files changed, 36 insertions, 23 deletions

diff --git a/roles/openshift_logging_mux/tasks/determine_version.yaml b/roles/openshift_logging_mux/tasks/determine_version.yaml
index 229bcf3d5..769475dd5 100644
--- a/roles/openshift_logging_mux/tasks/determine_version.yaml
+++ b/roles/openshift_logging_mux/tasks/determine_version.yaml
@@ -1,16 +1,16 @@
 ---
 # debating making this a module instead?
 - fail:
-    msg: Missing version to install provided by 'openshift_logging_image_version'
-  when: not openshift_logging_image_version or openshift_logging_image_version == ''
+    msg: Missing version to install provided by 'openshift_logging_mux_image_version'
+  when: not openshift_logging_mux_image_version or openshift_logging_mux_image_version == ''
 
 - set_fact:
     mux_version: "{{ __latest_mux_version }}"
-  when: openshift_logging_image_version == 'latest'
+  when: openshift_logging_mux_image_version == 'latest'
 
 # should we just assume that we will have the correct major version?
-- set_fact: mux_version="{{ openshift_logging_image_version | regex_replace('^v?(?P<major>\d)\.(?P<minor>\d).*$', '3_\\g<minor>') }}"
-  when: openshift_logging_image_version != 'latest'
+- set_fact: mux_version="{{ openshift_logging_mux_image_version | regex_replace('^v?(?P<major>\d)\.(?P<minor>\d).*$', '3_\\g<minor>') }}"
+  when: openshift_logging_mux_image_version != 'latest'
 
 - fail:
     msg: Invalid version specified for mux
diff --git a/roles/openshift_logging_mux/tasks/main.yaml b/roles/openshift_logging_mux/tasks/main.yaml
index 5b257139e..242d92188 100644
--- a/roles/openshift_logging_mux/tasks/main.yaml
+++ b/roles/openshift_logging_mux/tasks/main.yaml
@@ -7,6 +7,19 @@
     msg: Operations logs destination is required
   when: not openshift_logging_mux_ops_host or openshift_logging_mux_ops_host == ''
 
+- name: Set default image variables based on deployment_type
+  include_vars: "{{ var_file_name }}"
+  with_first_found:
+    - "{{ openshift_deployment_type | default(deployment_type) }}.yml"
+    - "default_images.yml"
+  loop_control:
+    loop_var: var_file_name
+
+- name: Set mux image facts
+  set_fact:
+    openshift_logging_mux_image_prefix: "{{ openshift_logging_mux_image_prefix | default(__openshift_logging_mux_image_prefix) }}"
+    openshift_logging_mux_image_version: "{{ openshift_logging_mux_image_version | default(__openshift_logging_mux_image_version) }}"
+
 - include: determine_version.yaml
 
 # allow passing in a tempdir
@@ -42,7 +55,7 @@
     name: "aggregated-logging-mux"
     namespace: "{{ openshift_logging_mux_namespace }}"
   when:
-  - openshift_logging_image_pull_secret == ''
+    - openshift_logging_image_pull_secret == ''
 
 # set service account scc
 - name: Set privileged permissions for Mux
@@ -112,14 +125,14 @@
     name: logging-mux
     namespace: "{{ openshift_logging_mux_namespace }}"
     files:
-    - name: ca
-      path: "{{ generated_certs_dir }}/ca.crt"
-    - name: key
-      path: "{{ generated_certs_dir }}/system.logging.mux.key"
-    - name: cert
-      path: "{{ generated_certs_dir }}/system.logging.mux.crt"
-    - name: shared_key
-      path: "{{ generated_certs_dir }}/mux_shared_key"
+      - name: ca
+        path: "{{ generated_certs_dir }}/ca.crt"
+      - name: key
+        path: "{{ generated_certs_dir }}/system.logging.mux.key"
+      - name: cert
+        path: "{{ generated_certs_dir }}/system.logging.mux.crt"
+      - name: shared_key
+        path: "{{ generated_certs_dir }}/mux_shared_key"
 
 # services
 - name: Set logging-mux service for external communication
@@ -133,11 +146,11 @@
     labels:
       logging-infra: 'support'
     ports:
-    - name: mux-forward
-      port: "{{ openshift_logging_mux_port }}"
-      targetPort: "mux-forward"
+      - name: mux-forward
+        port: "{{ openshift_logging_mux_port }}"
+        targetPort: "mux-forward"
     external_ips:
-    - "{{ ansible_eth0.ipv4.address }}"
+      - "{{ ansible_eth0.ipv4.address }}"
   when: openshift_logging_mux_allow_external | bool
 
 - name: Set logging-mux service for internal communication
@@ -151,9 +164,9 @@
     labels:
       logging-infra: 'support'
     ports:
-    - name: mux-forward
-      port: "{{ openshift_logging_mux_port }}"
-      targetPort: "mux-forward"
+      - name: mux-forward
+        port: "{{ openshift_logging_mux_port }}"
+        targetPort: "mux-forward"
   when: not openshift_logging_mux_allow_external | bool
 
 # create Mux DC
@@ -188,7 +201,7 @@
     selector: "{{ openshift_logging_mux_file_buffer_pvc_pv_selector }}"
     storage_class_name: "{{ openshift_logging_mux_file_buffer_pvc_storage_class_name | default('', true) }}"
   when:
-  - openshift_logging_mux_file_buffer_storage_type == "pvc"
+    - openshift_logging_mux_file_buffer_storage_type == "pvc"
 
 - name: Set logging-mux DC
   oc_obj:
@@ -197,7 +210,7 @@
     namespace: "{{ openshift_logging_mux_namespace }}"
     kind: dc
     files:
-    - "{{ tempdir }}/templates/logging-mux-dc.yaml"
+      - "{{ tempdir }}/templates/logging-mux-dc.yaml"
     delete_after: true
 
 - name: Add mux namespaces