diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-08 17:25:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-08 17:25:10 -0500 |
| commit | bf0f8266e91b552ffa815d3a7bcb65f105606438 (patch) | |
| tree | f6bc352be8a8550b2676ffd8cd1e486d3e1c0a37 /playbooks/common/openshift-cluster/redeploy-certificates.yml | |
| parent | a10e68b03db0e318e960a2f13f5f30ccb59b8d09 (diff) | |
| parent | 9e90b0085b1203830164c7ea515e69236f16de76 (diff) | |
| download | openshift-bf0f8266e91b552ffa815d3a7bcb65f105606438.tar.gz openshift-bf0f8266e91b552ffa815d3a7bcb65f105606438.tar.bz2 openshift-bf0f8266e91b552ffa815d3a7bcb65f105606438.tar.xz openshift-bf0f8266e91b552ffa815d3a7bcb65f105606438.zip | |
Merge pull request #2764 from openshift/revert-2751-BZ1388253
Revert "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 74147fe01..5f008a045 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.common.hostname | lower }} -o json + get node {{ openshift.node.nodename }} -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.common.hostname | lower }} + manage-node {{ openshift.node.nodename }} --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.common.hostname | lower }} + manage-node {{ openshift.node.nodename }} --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.common.hostname | lower }} --schedulable=true + manage-node {{ openshift.node.nodename }} --schedulable=true delegate_to: "{{ groups.oo_first_master.0 }}" when: openshift_certificates_redeploy_ca | default(false) | bool and was_schedulable | bool |