summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-06-23 11:43:56 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-06-23 11:43:56 -0400
commitce11b242bb3f6101cf8e0fa3af40a2908d4940d4 (patch)
tree7dcb790cafa9cd7169df9e8262ff3210129e6282 /roles
parentcf1fb0bedbc4fb181c21749dbbe503abc71b21fd (diff)
parent631b4353978bab6430927619e46770a9684c6242 (diff)
downloadopenshift-ce11b242bb3f6101cf8e0fa3af40a2908d4940d4.tar.gz
openshift-ce11b242bb3f6101cf8e0fa3af40a2908d4940d4.tar.bz2
openshift-ce11b242bb3f6101cf8e0fa3af40a2908d4940d4.tar.xz
openshift-ce11b242bb3f6101cf8e0fa3af40a2908d4940d4.zip
Merge pull request #296 from brenton/master
Bug 1234717 - oo-install-ose should use openshift_hostname as paramet…
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node/tasks/main.yml6
1 files changed, 3 insertions, 3 deletions
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