From df51a7dddad9e6f93a24c3ec07a07a661e6e168a Mon Sep 17 00:00:00 2001
From: Brenton Leanhardt <bleanhar@redhat.com>
Date: Fri, 26 Jun 2015 15:04:56 -0400
Subject: delegate_to doesn't appear to be thread safe

---
 playbooks/common/openshift-node/config.yml | 25 +++++++++++++++++++++++++
 roles/openshift_node/tasks/main.yml        | 21 ---------------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 2d2560db4..d3c223f50 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -135,3 +135,28 @@
   roles:
   - os_env_extras
   - os_env_extras_node
+
+- name: Set scheduleability
+  serial: 1
+  hosts: oo_nodes_to_config
+  tasks:
+  - 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
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
-- 
cgit v1.2.3