From 631b4353978bab6430927619e46770a9684c6242 Mon Sep 17 00:00:00 2001 From: Brenton Leanhardt Date: Tue, 23 Jun 2015 09:09:10 -0400 Subject: Bug 1234717 - oo-install-ose should use openshift_hostname as parameter when checking schedulable state --- roles/openshift_node/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'roles/openshift_node') diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 4789dec85..13f30a6f8 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -77,7 +77,7 @@ - name: Check scheduleable state delegate_to: "{{ openshift_first_master }}" command: > - {{ openshift.common.client_binary }} get node {{ inventory_hostname }} + {{ openshift.common.client_binary }} get node {{ openshift.common.hostname }} register: ond_get_node until: ond_get_node.rc == 0 retries: 10 @@ -86,11 +86,11 @@ - name: Handle unscheduleable node delegate_to: "{{ openshift_first_master }}" command: > - {{ openshift.common.admin_binary }} manage-node {{ inventory_hostname }} --schedulable=false + {{ openshift.common.admin_binary }} manage-node {{ openshift.common.hostname }} --schedulable=false when: openshift_scheduleable is defined and openshift_scheduleable == False and "SchedulingDisabled" not in ond_get_node.stdout - name: Handle scheduleable node delegate_to: "{{ openshift_first_master }}" command: > - {{ openshift.common.admin_binary }} manage-node {{ inventory_hostname }} --schedulable=true + {{ openshift.common.admin_binary }} manage-node {{ openshift.common.hostname }} --schedulable=true when: (openshift_scheduleable is not defined or openshift_scheduleable == True) and "SchedulingDisabled" in ond_get_node.stdout -- cgit v1.2.3