summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorDiego Castro <spinolacastro@gmail.com>2015-08-17 17:38:23 -0300
committerDiego Castro <spinolacastro@gmail.com>2015-08-17 17:38:23 -0300
commit8468d25fae71c80277c10ad975641cb1ba230fd8 (patch)
tree3e133c06cb9c015208845f50fbb1131d003705f4 /roles/openshift_master
parent7f740ff24b807f9f88209785a027056bfa146e2e (diff)
downloadopenshift-8468d25fae71c80277c10ad975641cb1ba230fd8.tar.gz
openshift-8468d25fae71c80277c10ad975641cb1ba230fd8.tar.bz2
openshift-8468d25fae71c80277c10ad975641cb1ba230fd8.tar.xz
openshift-8468d25fae71c80277c10ad975641cb1ba230fd8.zip
Get default values from openshift_facts
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j212
1 files changed, 6 insertions, 6 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index b738084c0..7a8ab5c00 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -100,13 +100,13 @@ policyConfig:
openshiftInfrastructureNamespace: openshift-infra
openshiftSharedResourcesNamespace: openshift
projectConfig:
- defaultNodeSelector: "{{ openshift.master.default_node_selector | default("") }}"
- projectRequestMessage: "{{ openshift.master.project_request_message | default("") }}"
- projectRequestTemplate: "{{ openshift.master.project_request_template | default("") }}"
+ defaultNodeSelector: {{ openshift.master.default_node_selector }}
+ projectRequestMessage: {{ openshift.master.project_request_message }}
+ projectRequestTemplate: {{ openshift.master.project_request_template }}
securityAllocator:
- mcsAllocatorRange: "{{ openshift.master.project_request_template | default("s0:/2") }}"
- mcsLabelsPerProject: "{{ openshift.master.mcs_labels_per_project | default("5") }}"
- uidAllocatorRange: "{{ openshift.master.uid_allocator_range | default("1000000000-1999999999/10000") }}"
+ mcsAllocatorRange: {{ openshift.master.mcs_allocator_range }}
+ mcsLabelsPerProject: {{ openshift.master.mcs_labels_per_project }}
+ uidAllocatorRange: {{ openshift.master.uid_allocator_range }}
routingConfig:
subdomain: "{{ openshift.master.default_subdomain | default("") }}"
serviceAccountConfig: