diff options
author | Andrew Butcher <abutcher@afrolegs.com> | 2016-09-26 14:20:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-26 14:20:13 -0400 |
commit | f7ba21be241e9a3f3354b44332611fe5095fc57f (patch) | |
tree | 4f981163b3b792d2af3de610e66f4eac2a65f1f9 /playbooks/byo | |
parent | b7aaf7bd860625a1dc929a2397c28c3e33aab94f (diff) | |
parent | 1f2276fff1e41c1d9440ee8b589042ee249b95d7 (diff) | |
download | openshift-f7ba21be241e9a3f3354b44332611fe5095fc57f.tar.gz openshift-f7ba21be241e9a3f3354b44332611fe5095fc57f.tar.bz2 openshift-f7ba21be241e9a3f3354b44332611fe5095fc57f.tar.xz openshift-f7ba21be241e9a3f3354b44332611fe5095fc57f.zip |
Merge pull request #2501 from lhuard1A/fix_openstack_cloudprovider
Fix openstack cloudprovider
Diffstat (limited to 'playbooks/byo')
-rw-r--r-- | playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml index 3a285ab9f..1fa32570c 100644 --- a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml @@ -25,13 +25,13 @@ tasks: - name: Prepare for Node evacuation command: > - {{ openshift.common.admin_binary }} manage-node {{ openshift.common.hostname | lower }} --schedulable=false + {{ openshift.common.admin_binary }} manage-node {{ openshift.node.nodename }} --schedulable=false delegate_to: "{{ groups.oo_first_master.0 }}" when: l_docker_upgrade is defined and l_docker_upgrade | bool and inventory_hostname in groups.oo_nodes_to_config - name: Evacuate Node for Kubelet upgrade command: > - {{ openshift.common.admin_binary }} manage-node {{ openshift.common.hostname | lower }} --evacuate --force + {{ openshift.common.admin_binary }} manage-node {{ openshift.node.nodename }} --evacuate --force delegate_to: "{{ groups.oo_first_master.0 }}" when: l_docker_upgrade is defined and l_docker_upgrade | bool and inventory_hostname in groups.oo_nodes_to_config @@ -40,7 +40,7 @@ - name: Set node schedulability command: > - {{ openshift.common.admin_binary }} manage-node {{ openshift.common.hostname | lower }} --schedulable=true + {{ openshift.common.admin_binary }} manage-node {{ openshift.node.nodename }} --schedulable=true delegate_to: "{{ groups.oo_first_master.0 }}" when: openshift.node.schedulable | bool when: l_docker_upgrade is defined and l_docker_upgrade | bool and inventory_hostname in groups.oo_nodes_to_config and openshift.node.schedulable | bool |