diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-21 18:31:49 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-21 18:31:49 -0800 |
| commit | a77205f5b49cc06b18c2d881512f9ec25e347a75 (patch) | |
| tree | 84091778e8fe96ef85948e0fd7c21c5d2ede2e47 | |
| parent | b1f728d464e8ac4b80462b3dbaa87c631430368b (diff) | |
| parent | 04fe113f750601ce802a4ca89e71a1e789c9053c (diff) | |
| download | openshift-a77205f5b49cc06b18c2d881512f9ec25e347a75.tar.gz openshift-a77205f5b49cc06b18c2d881512f9ec25e347a75.tar.bz2 openshift-a77205f5b49cc06b18c2d881512f9ec25e347a75.tar.xz openshift-a77205f5b49cc06b18c2d881512f9ec25e347a75.zip | |
Merge pull request #6806 from spadgett/console-node-selector
Automatic merge from submit-queue.
Bug 1536262: Default console and TSB node selector to openshift_hosted_infra_selector
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1536262
Fixes #6805
/kind bug
/assign @sdodson
@jupierce You should no longer need to set `openshift_web_console_nodeselector` when this merges.
@bparees @jim-minter FYI, I switched the TSB default as well.
| -rw-r--r-- | roles/openshift_web_console/defaults/main.yml | 3 | ||||
| -rw-r--r-- | 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 }}" |