summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted/vars
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-03-17 17:22:19 -0500
committerGitHub <noreply@github.com>2017-03-17 17:22:19 -0500
commitcd56448dae931dc5c270f8090b7ba25cc6833805 (patch)
tree56117b1a1ec98487a65024e1ba3aabe78279e310 /roles/openshift_hosted/vars
parent3e8d87beaa2adc2d6f8a9e1bcc0c6cba1090acbe (diff)
parent94251afea2f1f58aabf0ae0f3ca544dd8f1dd368 (diff)
downloadopenshift-cd56448dae931dc5c270f8090b7ba25cc6833805.tar.gz
openshift-cd56448dae931dc5c270f8090b7ba25cc6833805.tar.bz2
openshift-cd56448dae931dc5c270f8090b7ba25cc6833805.tar.xz
openshift-cd56448dae931dc5c270f8090b7ba25cc6833805.zip
Merge pull request #3656 from mtnbikenc/refactor-openshift_projects
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_hosted/vars')
-rw-r--r--roles/openshift_hosted/vars/main.yml10
1 files changed, 10 insertions, 0 deletions
diff --git a/roles/openshift_hosted/vars/main.yml b/roles/openshift_hosted/vars/main.yml
index 521578cd0..0821d0e7e 100644
--- a/roles/openshift_hosted/vars/main.yml
+++ b/roles/openshift_hosted/vars/main.yml
@@ -1,3 +1,13 @@
---
openshift_master_config_dir: "{{ openshift.common.config_base }}/master"
registry_config_secret_name: registry-config
+
+openshift_default_projects:
+ default:
+ default_node_selector: ''
+ logging:
+ default_node_selector: ''
+ openshift-infra:
+ default_node_selector: ''
+
+openshift_projects: "{{ openshift_additional_projects | default({}) | oo_merge_dicts(openshift_default_projects) }}"