summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-06-29 15:41:28 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-06-29 15:41:28 -0400
commita27076bee3e8f93681f5d5e1c4b072084f6847b6 (patch)
tree4ee6293daf334a825e9fcf1caa71ce42189a621d /roles
parentaccd98845aac3e271295e3115501b25e6d72b114 (diff)
parentcde074730ed8278673498157008651d192c8236a (diff)
downloadopenshift-a27076bee3e8f93681f5d5e1c4b072084f6847b6.tar.gz
openshift-a27076bee3e8f93681f5d5e1c4b072084f6847b6.tar.bz2
openshift-a27076bee3e8f93681f5d5e1c4b072084f6847b6.tar.xz
openshift-a27076bee3e8f93681f5d5e1c4b072084f6847b6.zip
Merge pull request #309 from brenton/manage_node
delegate_to doesn't appear to be thread safe
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_manage_node/tasks/main.yml11
-rw-r--r--roles/openshift_node/tasks/main.yml21
2 files changed, 11 insertions, 21 deletions
diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml
new file mode 100644
index 000000000..d4c623f10
--- /dev/null
+++ b/roles/openshift_manage_node/tasks/main.yml
@@ -0,0 +1,11 @@
+- name: Handle unscheduleable node
+ delegate_to: "{{ openshift_first_master }}"
+ command: >
+ {{ openshift.common.admin_binary }} manage-node {{ item }} --schedulable=false
+ with_items: openshift_unscheduleable_nodes
+
+- name: Handle scheduleable node
+ delegate_to: "{{ openshift_first_master }}"
+ command: >
+ {{ openshift.common.admin_binary }} manage-node {{ item }} --schedulable=true
+ with_items: openshift_scheduleable_nodes
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 13f30a6f8..770b55351 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -73,24 +73,3 @@
- name: Start and enable openshift-node
service: name=openshift-node enabled=yes state=started
-
-- name: Check scheduleable state
- delegate_to: "{{ openshift_first_master }}"
- command: >
- {{ openshift.common.client_binary }} get node {{ openshift.common.hostname }}
- register: ond_get_node
- until: ond_get_node.rc == 0
- retries: 10
- delay: 5
-
-- name: Handle unscheduleable node
- delegate_to: "{{ openshift_first_master }}"
- command: >
- {{ 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 {{ openshift.common.hostname }} --schedulable=true
- when: (openshift_scheduleable is not defined or openshift_scheduleable == True) and "SchedulingDisabled" in ond_get_node.stdout