From 04fe113f750601ce802a4ca89e71a1e789c9053c Mon Sep 17 00:00:00 2001 From: Samuel Padgett Date: Sun, 21 Jan 2018 08:00:34 -0500 Subject: Bug 1536262: Default console and TSB node selector to openshift_hosted_infra_selector Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1536262 --- roles/openshift_web_console/defaults/main.yml | 3 +-- roles/template_service_broker/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/openshift_web_console/defaults/main.yml b/roles/openshift_web_console/defaults/main.yml index 4f395398c..c747f73a8 100644 --- a/roles/openshift_web_console/defaults/main.yml +++ b/roles/openshift_web_console/defaults/main.yml @@ -1,3 +1,2 @@ --- -# TODO: This is temporary and will be updated to use taints and tolerations so that the console runs on the masters -openshift_web_console_nodeselector: {"region":"infra"} +openshift_web_console_nodeselector: "{{ openshift_hosted_infra_selector | default('region=infra') | map_from_pairs }}" diff --git a/roles/template_service_broker/defaults/main.yml b/roles/template_service_broker/defaults/main.yml index c32872d24..3465832cc 100644 --- a/roles/template_service_broker/defaults/main.yml +++ b/roles/template_service_broker/defaults/main.yml @@ -3,4 +3,4 @@ template_service_broker_remove: False template_service_broker_install: True openshift_template_service_broker_namespaces: ['openshift'] -template_service_broker_selector: { "region": "infra" } +template_service_broker_selector: "{{ openshift_hosted_infra_selector | default('region=infra') | map_from_pairs }}" -- cgit v1.2.3