diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-10-19 13:55:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-19 13:55:01 -0400 |
| commit | 7025459e3e4f02494e8b005623af52ca738317b4 (patch) | |
| tree | afa9662170d4bbf216fbd124d638eea825433489 /playbooks/byo/openshift-cluster | |
| parent | 3be15dae0b039e06e31b4eecc933851ada7446cb (diff) | |
| parent | 3ea0166aa301990d4f95fdb1c48557e710aa0b05 (diff) | |
| download | openshift-7025459e3e4f02494e8b005623af52ca738317b4.tar.gz openshift-7025459e3e4f02494e8b005623af52ca738317b4.tar.bz2 openshift-7025459e3e4f02494e8b005623af52ca738317b4.tar.xz openshift-7025459e3e4f02494e8b005623af52ca738317b4.zip | |
Merge pull request #2621 from dgoodwin/symlink-fix
Switch from "oadm" to "oc adm" and fix bug in binary sync.
Diffstat (limited to 'playbooks/byo/openshift-cluster')
| -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 9be6becc1..834461e14 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.node.nodename }} --schedulable=false + {{ openshift.common.client_binary }} adm 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_upgrade - name: Evacuate Node for Kubelet upgrade command: > - {{ openshift.common.admin_binary }} manage-node {{ openshift.node.nodename }} --evacuate --force + {{ openshift.common.client_binary }} adm 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_upgrade @@ -40,7 +40,7 @@ - name: Set node schedulability command: > - {{ openshift.common.admin_binary }} manage-node {{ openshift.node.nodename }} --schedulable=true + {{ openshift.common.client_binary }} adm 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_upgrade and openshift.node.schedulable | bool |