summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to 'roles')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py28
-rw-r--r--roles/openshift_master/tasks/main.yml7
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j29
3 files changed, 14 insertions, 30 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 0fde372ed..4e0989c5f 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -349,33 +349,6 @@ def set_identity_providers_if_unset(facts):
return facts
-def set_project_config_if_unset(facts):
- """ Set project_config fact if not already present in facts dict
-
- Args:
- facts (dict): existing facts
- Returns:
- dict: the facts dict updated with the generated identity providers
- facts if they were not already present
- """
- if 'master' in facts:
- if 'project_config' not in facts['master']:
- config = dict(
- projectConfig=dict(
- defaultNodeSelector='',
- projectRequestMessage='',
- projectRequestTemplate='',
- securityAllocator=dict(
- mcsAllocatorRange='s0:/2',
- mcsLabelsPerProject=5,
- uidAllocatorRange='1000000000-1999999999/10000'
- )
- )
- )
- facts['master']['project_config'] = [config]
-
- return facts
-
def set_url_facts_if_unset(facts):
""" Set url facts if not already present in facts dict
@@ -727,7 +700,6 @@ class OpenShiftFacts(object):
facts['current_config'] = get_current_config(facts)
facts = set_url_facts_if_unset(facts)
facts = set_fluentd_facts_if_unset(facts)
- facts = set_project_config_if_unset(facts)
facts = set_identity_providers_if_unset(facts)
facts = set_registry_url_if_unset(facts)
facts = set_sdn_facts_if_unset(facts)
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: