From f1aec4727384913d0c0b285c58878d299d5f6bfb Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Thu, 23 Mar 2017 17:05:54 -0400 Subject: Specify enterprise defaults for logging and metrics images --- roles/openshift_metrics/tasks/main.yaml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'roles/openshift_metrics/tasks') diff --git a/roles/openshift_metrics/tasks/main.yaml b/roles/openshift_metrics/tasks/main.yaml index 1eebff3bf..f02906bc5 100644 --- a/roles/openshift_metrics/tasks/main.yaml +++ b/roles/openshift_metrics/tasks/main.yaml @@ -1,4 +1,11 @@ --- + +- name: Set default image variables based on deployment_type + include_vars: "{{ item }}" + with_first_found: + - "{{ openshift_deployment_type | default(deployment_type) }}.yml" + - "default_images.yml" + - name: Create temp directory for doing work in on target command: mktemp -td openshift-metrics-ansible-XXXXXX register: mktemp -- cgit v1.2.3 From 22d8eccb74bd2a1da5c29c0020f1f7ba89164cdc Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Fri, 24 Mar 2017 11:17:44 -0400 Subject: Fix overriding openshift_{logging,metrics}_image_prefix --- roles/openshift_metrics/tasks/main.yaml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'roles/openshift_metrics/tasks') diff --git a/roles/openshift_metrics/tasks/main.yaml b/roles/openshift_metrics/tasks/main.yaml index f02906bc5..c8d222c60 100644 --- a/roles/openshift_metrics/tasks/main.yaml +++ b/roles/openshift_metrics/tasks/main.yaml @@ -6,6 +6,11 @@ - "{{ openshift_deployment_type | default(deployment_type) }}.yml" - "default_images.yml" +- name: Set metrics image facts + set_fact: + openshift_metrics_image_prefix: "{{ openshift_metrics_image_prefix | default(__openshift_metrics_image_prefix) }}" + openshift_metrics_image_version: "{{ openshift_metrics_image_version | default(__openshift_metrics_image_version) }}" + - name: Create temp directory for doing work in on target command: mktemp -td openshift-metrics-ansible-XXXXXX register: mktemp -- cgit v1.2.3