From 5143d90ac0a808f1e8695060566d0e65e5b6bed7 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Tue, 16 Jan 2018 14:08:43 +0100 Subject: Web Console: use a different var for asset config This ensures mktemp from metrics role doesn't get reset when update_asset_config is being included --- roles/openshift_web_console/tasks/update_asset_config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/openshift_web_console/tasks/update_asset_config.yml b/roles/openshift_web_console/tasks/update_asset_config.yml index 0992b32e1..21b293bed 100644 --- a/roles/openshift_web_console/tasks/update_asset_config.yml +++ b/roles/openshift_web_console/tasks/update_asset_config.yml @@ -28,17 +28,17 @@ - name: Make temp directory command: mktemp -d /tmp/console-ansible-XXXXXX - register: mktemp + register: mktemp_console changed_when: False - name: Copy asset config to temp file copy: content: "{{webconsole_config.results.results[0].data['webconsole-config.yaml']}}" - dest: "{{ mktemp.stdout }}/webconsole-config.yaml" + dest: "{{ mktemp_console.stdout }}/webconsole-config.yaml" - name: Change asset config properties yedit: - src: "{{ mktemp.stdout }}/webconsole-config.yaml" + src: "{{ mktemp_console.stdout }}/webconsole-config.yaml" edits: "{{asset_config_edits}}" - name: Update web console config map @@ -47,12 +47,12 @@ name: webconsole-config state: present from_file: - webconsole-config.yaml: "{{ mktemp.stdout }}/webconsole-config.yaml" + webconsole-config.yaml: "{{ mktemp_console.stdout }}/webconsole-config.yaml" - name: Remove temp directory file: state: absent - name: "{{ mktemp.stdout }}" + name: "{{ mktemp_console.stdout }}" changed_when: False # There's currently no command to trigger a rollout for a k8s deployment -- cgit v1.2.3