summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-01-16 16:00:07 -0500
committerGitHub <noreply@github.com>2018-01-16 16:00:07 -0500
commit9424e6ffe7919c9651e860fe606895c7ab6b7ca8 (patch)
tree4c38fbfe814f839e71ff23a2d9e217338acc1a0c /roles
parentc933a61030a882e3d33834390e82a9e196e0f654 (diff)
parent5143d90ac0a808f1e8695060566d0e65e5b6bed7 (diff)
downloadopenshift-9424e6ffe7919c9651e860fe606895c7ab6b7ca8.tar.gz
openshift-9424e6ffe7919c9651e860fe606895c7ab6b7ca8.tar.bz2
openshift-9424e6ffe7919c9651e860fe606895c7ab6b7ca8.tar.xz
openshift-9424e6ffe7919c9651e860fe606895c7ab6b7ca8.zip
Merge pull request #6739 from vrutkovs/metrics-console-mktemp
Web Console: use a different var for asset config
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_web_console/tasks/update_asset_config.yml10
1 files 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