From 0ba0acba909ff02fb4f2735f7fb3916800ca9455 Mon Sep 17 00:00:00 2001
From: ewolinetz <ewolinet@redhat.com>
Date: Fri, 23 Jun 2017 14:15:59 -0500
Subject: Updating to label node and wait for apiservice to be healthy and
 started

---
 roles/openshift_service_catalog/tasks/install.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'roles/openshift_service_catalog/tasks/install.yml')

diff --git a/roles/openshift_service_catalog/tasks/install.yml b/roles/openshift_service_catalog/tasks/install.yml
index 6a2b94bc8..c1773b5f6 100644
--- a/roles/openshift_service_catalog/tasks/install.yml
+++ b/roles/openshift_service_catalog/tasks/install.yml
@@ -98,7 +98,7 @@
     cpu_requests: none
     memory_request: none
     cors_allowed_origin: localhost
-    node_selector: {"openshift-infra": "apiserver"}
+    node_selector: "{{ openshift_service_catalog_nodeselector | default ({'openshift-infra': 'apiserver'}) }}"
 
 - name: Set Service Catalog API Server daemonset
   oc_obj:
@@ -146,7 +146,7 @@
     image: ""
     cpu_limit: none
     memory_limit: none
-    node_selector: {"openshift-infra": "apiserver"}
+    node_selector: "{{ openshift_service_catalog_nodeselector | default ({'openshift-infra': 'apiserver'}) }}"
 
 - name: Set Controller Manager deployment
   oc_obj:
@@ -172,6 +172,8 @@
       - "{{ mktemp.stdout }}/controller_manager_service.yml"
     delete_after: yes
 
+- include: start_api_server.yml
+
 - name: Delete temp directory
   file:
     name: "{{ mktemp.stdout }}"
-- 
cgit v1.2.1