From 448c33754c7b5e7cde997a20e137825e85dde6d2 Mon Sep 17 00:00:00 2001
From: Andrew Butcher <abutcher@redhat.com>
Date: Mon, 21 Nov 2016 10:47:23 -0500
Subject: Delegate openshift_manage_node tasks to master host.

---
 playbooks/common/openshift-node/config.yml | 34 ++----------------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

(limited to 'playbooks/common')

diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 4824eeef3..e28da5713 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -139,6 +139,8 @@
   - role: nuage_node
     when: openshift.common.use_nuage | bool
   - role: nickhammond.logrotate
+  - role: openshift_manage_node
+    openshift_master_host: "{{ groups.oo_first_master.0 }}"
   tasks:
   - name: Create group for deployment type
     group_by: key=oo_nodes_deployment_type_{{ openshift.common.deployment_type }}
@@ -152,35 +154,3 @@
   tasks:
   - file: name={{ mktemp.stdout }} state=absent
     changed_when: False
-
-- name: Set node schedulability
-  hosts: oo_first_master
-  vars:
-    openshift_nodes: "{{ groups.oo_nodes_to_config | default([]) }}"
-  pre_tasks:
-  # Necessary because when you're on a node that's also a master the master will be
-  # restarted after the node restarts docker and it will take up to 60 seconds for
-  # systemd to start the master again
-  - name: Wait for master API to become available before proceeding
-    # Using curl here since the uri module requires python-httplib2 and
-    # wait_for port doesn't provide health information.
-    command: >
-      curl --silent --tlsv1.2
-      {% if openshift.common.version_gte_3_2_or_1_2 | bool %}
-      --cacert {{ openshift.common.config_base }}/master/ca-bundle.crt
-      {% else %}
-      --cacert {{ openshift.common.config_base }}/master/ca.crt
-      {% endif %}
-      {{ openshift.master.api_url }}/healthz/ready
-    args:
-      # Disables the following warning:
-      # Consider using get_url or uri module rather than running curl
-      warn: no
-    register: api_available_output
-    until: api_available_output.stdout == 'ok'
-    retries: 120
-    delay: 1
-    changed_when: false
-    when: openshift.common.is_containerized | bool
-  roles:
-  - openshift_manage_node
-- 
cgit v1.2.3