summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master_certificates
diff options
context:
space:
mode:
authorEric Wolinetz <ewolinet@redhat.com>2017-01-23 16:08:20 -0600
committerGitHub <noreply@github.com>2017-01-23 16:08:20 -0600
commit066494438d5baff9f555cd56a8bde94df148dc31 (patch)
treee0c802a5af8dc07f0a16b5d41ebea55de4a34d06 /roles/openshift_master_certificates
parentd740fd159416783c88839e6e2c2e150eb81b67da (diff)
parentc2bdcebcf9bc8aebba6d09a80c6b5cccdb17786d (diff)
downloadopenshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.gz
openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.bz2
openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.xz
openshift-066494438d5baff9f555cd56a8bde94df148dc31.zip
Merge branch 'master' into fix_logging_jks_gen
Diffstat (limited to 'roles/openshift_master_certificates')
-rw-r--r--roles/openshift_master_certificates/tasks/main.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_master_certificates/tasks/main.yml b/roles/openshift_master_certificates/tasks/main.yml
index a1688aabc..4620dd877 100644
--- a/roles/openshift_master_certificates/tasks/main.yml
+++ b/roles/openshift_master_certificates/tasks/main.yml
@@ -105,7 +105,7 @@
- name: Create local temp directory for syncing certs
local_action: command mktemp -d /tmp/openshift-ansible-XXXXXXX
- register: g_master_mktemp
+ register: g_master_certs_mktemp
changed_when: False
when: master_certs_missing | bool
delegate_to: localhost
@@ -123,7 +123,7 @@
- name: Retrieve the master cert tarball from the master
fetch:
src: "{{ openshift_master_generated_config_dir }}.tgz"
- dest: "{{ g_master_mktemp.stdout }}/"
+ dest: "{{ g_master_certs_mktemp.stdout }}/"
flat: yes
fail_on_missing: yes
validate_checksum: yes
@@ -138,11 +138,11 @@
- name: Unarchive the tarball on the master
unarchive:
- src: "{{ g_master_mktemp.stdout }}/{{ openshift_master_cert_subdir }}.tgz"
+ src: "{{ g_master_certs_mktemp.stdout }}/{{ openshift_master_cert_subdir }}.tgz"
dest: "{{ openshift_master_config_dir }}"
when: master_certs_missing | bool and inventory_hostname != openshift_ca_host
-- file: name={{ g_master_mktemp.stdout }} state=absent
+- file: name={{ g_master_certs_mktemp.stdout }} state=absent
changed_when: False
when: master_certs_missing | bool
delegate_to: localhost