summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorDiego Castro <spinolacastro@gmail.com>2015-08-12 22:53:10 -0300
committerDiego Castro <spinolacastro@gmail.com>2015-08-12 22:53:10 -0300
commit0bc39b7f4ad53344d19d0d783fd6eec4d3b424ef (patch)
tree14a91c960183ca56567844f2d575c5e161c7a2ce /roles/openshift_master
parentec293f371046a99b0f737a59b4a9f3f001af3279 (diff)
downloadopenshift-0bc39b7f4ad53344d19d0d783fd6eec4d3b424ef.tar.gz
openshift-0bc39b7f4ad53344d19d0d783fd6eec4d3b424ef.tar.bz2
openshift-0bc39b7f4ad53344d19d0d783fd6eec4d3b424ef.tar.xz
openshift-0bc39b7f4ad53344d19d0d783fd6eec4d3b424ef.zip
Update PR #458 from comments
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/tasks/main.yml7
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j29
2 files changed, 14 insertions, 2 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 5975ae224..019856f19 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -55,7 +55,12 @@
sdn_host_subnet_length: "{{ osm_host_subnet_length | default(None) }}"
default_subdomain: "{{ osm_default_subdomain | default(None) }}"
custom_cors_origins: "{{ osm_custom_cors_origins | default(None) }}"
- project_config: "{{ openshift_master_project_config | default(None) }}"
+ default_node_selector: "{{ osm_default_node_selector | default(None) }}"
+ project_request_message: "{{ osm_project_request_message | default(None) }}"
+ project_request_template: "{{ osm_project_request_template | default(None) }}"
+ mcs_allocator_range: "{{ osm_mcs_allocator_range | default(None) }}"
+ mcs_labels_per_project: "{{ osm_mcs_labels_per_project | default(None) }}"
+ uid_allocator_range: "{{ osm_uid_allocator_range | default(None) }}"
# TODO: These values need to be configurable
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 0a8f6c286..20dfe155a 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -93,7 +93,14 @@ policyConfig:
bootstrapPolicyFile: {{ openshift_master_policy }}
openshiftInfrastructureNamespace: openshift-infra
openshiftSharedResourcesNamespace: openshift
-{% include 'v1_partials/projectConfig.j2' %}
+projectConfig:
+ defaultNodeSelector: "{{ openshift.master.default_node_selector | default("") }}"
+ projectRequestMessage: "{{ openshift.master.project_request_message | default("") }}"
+ projectRequestTemplate: "{{ openshift.master.project_request_template | default("") }}"
+ 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") }}"
routingConfig:
subdomain: "{{ openshift.master.default_subdomain | default("") }}"
serviceAccountConfig: