summaryrefslogtreecommitdiffstats
path: root/roles/openshift_manage_node
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-11-22 14:38:08 -0500
committerGitHub <noreply@github.com>2016-11-22 14:38:08 -0500
commitfb357a2c39bb06624fd387fc490947163bbf3e0b (patch)
treef993ce69de6b5fdf8a7d66ae1f309192fafe5839 /roles/openshift_manage_node
parent11594f847088c4428bc2734b181b63766f895c31 (diff)
parent1f9259a0089fa4f1a6895ea69b7bc3a5e3b862b1 (diff)
downloadopenshift-fb357a2c39bb06624fd387fc490947163bbf3e0b.tar.gz
openshift-fb357a2c39bb06624fd387fc490947163bbf3e0b.tar.bz2
openshift-fb357a2c39bb06624fd387fc490947163bbf3e0b.tar.xz
openshift-fb357a2c39bb06624fd387fc490947163bbf3e0b.zip
Merge pull request #2845 from abutcher/fix-mixed-env
Fix issues encountered in mixed environments
Diffstat (limited to 'roles/openshift_manage_node')
-rw-r--r--roles/openshift_manage_node/tasks/main.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml
index 88cdd2d89..c06758833 100644
--- a/roles/openshift_manage_node/tasks/main.yml
+++ b/roles/openshift_manage_node/tasks/main.yml
@@ -47,7 +47,7 @@
- name: Wait for Node Registration
command: >
- {{ openshift.common.client_binary }} get node {{ openshift.node.nodename }}
+ {{ hostvars[openshift_master_host].openshift.common.client_binary }} get node {{ openshift.node.nodename }}
--config={{ openshift_manage_node_kubeconfig }}
-n default
register: omd_get_node
@@ -60,7 +60,7 @@
- name: Set node schedulability
command: >
- {{ openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename }} --schedulable={{ 'true' if openshift.node.schedulable | bool else 'false' }}
+ {{ hostvars[openshift_master_host].openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename }} --schedulable={{ 'true' if openshift.node.schedulable | bool else 'false' }}
--config={{ openshift_manage_node_kubeconfig }}
-n default
when: "'nodename' in openshift.node"
@@ -68,7 +68,7 @@
- name: Label nodes
command: >
- {{ openshift.common.client_binary }} label --overwrite node {{ openshift.node.nodename }} {{ openshift.node.labels | oo_combine_dict }}
+ {{ hostvars[openshift_master_host].openshift.common.client_binary }} label --overwrite node {{ openshift.node.nodename }} {{ openshift.node.labels | oo_combine_dict }}
--config={{ openshift_manage_node_kubeconfig }}
-n default
when: "'nodename' in openshift.node and 'labels' in openshift.node and openshift.node.labels != {}"