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/upgrades | |
| 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/upgrades')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml index 1f314c854..e66344f99 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml @@ -17,7 +17,7 @@ # we merge upgrade functionality into the base roles and a normal config.yml playbook run. - name: Determine if node is currently scheduleable command: > - {{ openshift.common.client_binary }} get node {{ openshift.node.nodename | lower }} -o json + {{ openshift.common.client_binary }} get node {{ openshift.common.hostname | lower }} -o json register: node_output delegate_to: "{{ groups.oo_first_master.0 }}" changed_when: false @@ -29,7 +29,7 @@ - name: Mark unschedulable if host is a node command: > - {{ openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename | lower }} --schedulable=false + {{ openshift.common.client_binary }} adm manage-node {{ openshift.common.hostname | lower }} --schedulable=false delegate_to: "{{ groups.oo_first_master.0 }}" when: inventory_hostname in groups.oo_nodes_to_upgrade # NOTE: There is a transient "object has been modified" error here, allow a couple @@ -41,7 +41,7 @@ - name: Evacuate Node for Kubelet upgrade command: > - {{ openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename | lower }} --evacuate --force + {{ openshift.common.client_binary }} adm manage-node {{ openshift.common.hostname | lower }} --evacuate --force delegate_to: "{{ groups.oo_first_master.0 }}" when: inventory_hostname in groups.oo_nodes_to_upgrade tasks: @@ -64,12 +64,10 @@ - name: Set node schedulability command: > - {{ openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename | lower }} --schedulable=true + {{ openshift.common.client_binary }} adm manage-node {{ openshift.common.hostname | lower }} --schedulable=true delegate_to: "{{ groups.oo_first_master.0 }}" when: inventory_hostname in groups.oo_nodes_to_upgrade and was_schedulable | bool register: node_sched until: node_sched.rc == 0 retries: 3 delay: 1 - - |