diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-08 10:23:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-08 10:23:43 -0500 |
| commit | 399d4b93cbff1ad98d332ae05302455d0b3c98e1 (patch) | |
| tree | 4bacee1bbee196895d00270b5265fbb86b01e8ad /playbooks/common/openshift-cluster/redeploy-certificates.yml | |
| parent | 011f3d38f288f209db094777eadbcc304629c15b (diff) | |
| parent | 0cd7191cd788d2e6b0ec8d3c5f52562433ed8a13 (diff) | |
| download | openshift-399d4b93cbff1ad98d332ae05302455d0b3c98e1.tar.gz openshift-399d4b93cbff1ad98d332ae05302455d0b3c98e1.tar.bz2 openshift-399d4b93cbff1ad98d332ae05302455d0b3c98e1.tar.xz openshift-399d4b93cbff1ad98d332ae05302455d0b3c98e1.zip | |
Merge pull request #2751 from sdodson/BZ1388253
Revert openshift.node.nodename changes
Diffstat (limited to 'playbooks/common/openshift-cluster/redeploy-certificates.yml')
| -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 5f008a045..74147fe01 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates.yml @@ -212,7 +212,7 @@ - name: Determine if node is currently scheduleable command: > {{ openshift.common.client_binary }} --config={{ hostvars[groups.oo_first_master.0].mktemp.stdout }}/admin.kubeconfig - get node {{ openshift.node.nodename }} -o json + get node {{ openshift.common.hostname | lower }} -o json register: node_output when: openshift_certificates_redeploy_ca | default(false) | bool delegate_to: "{{ groups.oo_first_master.0 }}" @@ -225,7 +225,7 @@ - name: Prepare for node evacuation command: > {{ openshift.common.client_binary }} adm --config={{ hostvars[groups.oo_first_master.0].mktemp.stdout }}/admin.kubeconfig - manage-node {{ openshift.node.nodename }} + manage-node {{ openshift.common.hostname | lower }} --schedulable=false delegate_to: "{{ groups.oo_first_master.0 }}" when: openshift_certificates_redeploy_ca | default(false) | bool and was_schedulable | bool @@ -233,7 +233,7 @@ - name: Evacuate node command: > {{ openshift.common.client_binary }} adm --config={{ hostvars[groups.oo_first_master.0].mktemp.stdout }}/admin.kubeconfig - manage-node {{ openshift.node.nodename }} + manage-node {{ openshift.common.hostname | lower }} --evacuate --force delegate_to: "{{ groups.oo_first_master.0 }}" when: openshift_certificates_redeploy_ca | default(false) | bool and was_schedulable | bool @@ -241,7 +241,7 @@ - name: Set node schedulability command: > {{ openshift.common.client_binary }} adm --config={{ hostvars[groups.oo_first_master.0].mktemp.stdout }}/admin.kubeconfig - manage-node {{ openshift.node.nodename }} --schedulable=true + 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 |