Merge pull request #7575 from fabianvf/bz1557516

Bug 1557516- ASB now scheduled on infra nodes
openshift · Mar 28, 2018 · 82887b1 · 82887b1
2 parents 556ddbb + 8b9250d
commit 82887b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/roles/ansible_service_broker/defaults/main.yml b/roles/ansible_service_broker/defaults/main.yml
@@ -1,5 +1,7 @@
 ---
 
+ansible_service_broker_node_selector: "{{ openshift_hosted_infra_selector | default('region=infra') | map_from_pairs }}"
+
 ansible_service_broker_remove: false
 ansible_service_broker_install: true
 ansible_service_broker_log_level: info

diff --git a/roles/ansible_service_broker/tasks/install.yml b/roles/ansible_service_broker/tasks/install.yml
@@ -233,6 +233,7 @@
           replicas: 1
           selector:
             app: openshift-ansible-service-broker
+          nodeSelector: '{{ ansible_service_broker_node_selector }}'
           strategy:
             type: Rolling
           template:
@@ -295,16 +296,7 @@
                   secret:
                     secretName: broker-etcd-auth-secret
 
-- name: Search for existing Ansible Service Broker etcd deployment config
-  oc_obj:
-    name: asb-etcd
-    namespace: openshift-ansible-service-broker
-    kind: DeploymentConfig
-    state: list
-  register: asb_etcd_dc
-
 - name: Create asb-etcd deployment config
-  when: asb_etcd_dc.results.results.0 | length == 0
   oc_obj:
     name: asb-etcd
     namespace: openshift-ansible-service-broker
@@ -324,6 +316,7 @@
           replicas: 1
           selector:
             app: etcd
+          nodeSelector: '{{ ansible_service_broker_node_selector }}'
           strategy:
             type: Rolling
           template: