diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2017-01-20 10:40:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-20 10:40:23 -0500 |
| commit | 746ddd2d48c5fb738ccd80a16ca0a5a66676b6c2 (patch) | |
| tree | 7929bc5ff6978153064926e13be71b9e67fd0e48 | |
| parent | 836bd8115c7d9386b9f5d3d6cca41785853c16c7 (diff) | |
| parent | 92d0897ff898822772106b6e8edf9a32afb9f4ca (diff) | |
| download | openshift-746ddd2d48c5fb738ccd80a16ca0a5a66676b6c2.tar.gz openshift-746ddd2d48c5fb738ccd80a16ca0a5a66676b6c2.tar.bz2 openshift-746ddd2d48c5fb738ccd80a16ca0a5a66676b6c2.tar.xz openshift-746ddd2d48c5fb738ccd80a16ca0a5a66676b6c2.zip | |
Merge pull request #3132 from richm/g_master_mktemp-conflict
g_master_mktemp in openshift-master conflicts with openshift_master_certificates
| -rw-r--r-- | roles/openshift_master_certificates/tasks/main.yml | 8 |
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 |