diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-11 20:08:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-11 20:08:24 -0400 |
| commit | 16fda8158107f10615bf2685eb8e7c55c1dcda04 (patch) | |
| tree | df5bbe5604290d63cf8e0f6f10bd3b3d728407aa | |
| parent | ae26dfd755cc079ff90954107c9a51c51c633565 (diff) | |
| parent | cd38a06539dbf9c063510761932d7a33cd68b5ee (diff) | |
| download | openshift-16fda8158107f10615bf2685eb8e7c55c1dcda04.tar.gz openshift-16fda8158107f10615bf2685eb8e7c55c1dcda04.tar.bz2 openshift-16fda8158107f10615bf2685eb8e7c55c1dcda04.tar.xz openshift-16fda8158107f10615bf2685eb8e7c55c1dcda04.zip | |
Merge pull request #2288 from abutcher/redeploy-mktemp
Reference tmpdir from first master hostvars when evacuating nodes.
| -rw-r--r-- | playbooks/common/openshift-cluster/redeploy-certificates.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates.yml b/playbooks/common/openshift-cluster/redeploy-certificates.yml index 6f559badd..b97906072 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates.yml @@ -201,7 +201,7 @@ tasks: - name: Determine if node is currently scheduleable command: > - {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig + {{ openshift.common.client_binary }} --config={{ hostvars[groups.oo_first_master.0].mktemp.stdout }}/admin.kubeconfig get node {{ openshift.common.hostname | lower }} -o json register: node_output when: openshift_certificates_redeploy_ca | default(false) | bool @@ -214,7 +214,7 @@ - name: Prepare for node evacuation command: > - {{ openshift.common.admin_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig + {{ openshift.common.admin_binary }} --config={{ hostvars[groups.oo_first_master.0].mktemp.stdout }}/admin.kubeconfig manage-node {{ openshift.common.hostname | lower }} --schedulable=false delegate_to: "{{ groups.oo_first_master.0 }}" @@ -222,7 +222,7 @@ - name: Evacuate node command: > - {{ openshift.common.admin_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig + {{ openshift.common.admin_binary }} --config={{ hostvars[groups.oo_first_master.0].mktemp.stdout }}/admin.kubeconfig manage-node {{ openshift.common.hostname | lower }} --evacuate --force delegate_to: "{{ groups.oo_first_master.0 }}" @@ -230,7 +230,7 @@ - name: Set node schedulability command: > - {{ openshift.common.admin_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig + {{ openshift.common.admin_binary }} --config={{ hostvars[groups.oo_first_master.0].mktemp.stdout }}/admin.kubeconfig manage-node {{ openshift.common.hostname | lower }} --schedulable=true delegate_to: "{{ groups.oo_first_master.0 }}" when: openshift_certificates_redeploy_ca | default(false) | bool and was_schedulable | bool |