summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-11-28 15:00:05 -0500
committerMichael Gugino <mgugino@redhat.com>2017-11-28 17:22:08 -0500
commit42f206740d3b065ebdbc95f12315f922a1d70c7d (patch)
tree9e00aa967937a2ec9762fe4f8bec4e0422cf8513 /roles/openshift_master
parentbc77099615299390638a69adcf96c0a67c5e5275 (diff)
downloadopenshift-42f206740d3b065ebdbc95f12315f922a1d70c7d.tar.gz
openshift-42f206740d3b065ebdbc95f12315f922a1d70c7d.tar.bz2
openshift-42f206740d3b065ebdbc95f12315f922a1d70c7d.tar.xz
openshift-42f206740d3b065ebdbc95f12315f922a1d70c7d.zip
Remove openshift_facts project_cfg_facts
This simplifies some variable logic.
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/defaults/main.yml6
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j212
2 files changed, 12 insertions, 6 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml
index 1fe7086bc..8e4a46ebb 100644
--- a/roles/openshift_master/defaults/main.yml
+++ b/roles/openshift_master/defaults/main.yml
@@ -16,6 +16,12 @@ system_images_registry: "{{ system_images_registry_dict[openshift_deployment_typ
l_is_master_system_container: "{{ (openshift_use_master_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
openshift_master_dns_port: 8053
+osm_default_node_selector: ''
+osm_project_request_template: ''
+osm_mcs_allocator_range: 's0:/2'
+osm_mcs_labels_per_project: 5
+osm_uid_allocator_range: '1000000000-1999999999/10000'
+osm_project_request_message: ''
openshift_node_ips: []
r_openshift_master_clean_install: false
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index d5dd9e9c0..a0f00e545 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -196,13 +196,13 @@ policyConfig:
openshiftInfrastructureNamespace: openshift-infra
openshiftSharedResourcesNamespace: openshift
projectConfig:
- defaultNodeSelector: "{{ openshift.master.default_node_selector }}"
- projectRequestMessage: "{{ openshift.master.project_request_message }}"
- projectRequestTemplate: "{{ openshift.master.project_request_template }}"
+ defaultNodeSelector: "{{ osm_default_node_selector }}"
+ projectRequestMessage: "{{ osm_project_request_message }}"
+ projectRequestTemplate: "{{ osm_project_request_template }}"
securityAllocator:
- mcsAllocatorRange: "{{ openshift.master.mcs_allocator_range }}"
- mcsLabelsPerProject: {{ openshift.master.mcs_labels_per_project }}
- uidAllocatorRange: "{{ openshift.master.uid_allocator_range }}"
+ mcsAllocatorRange: "{{ osm_mcs_allocator_range }}"
+ mcsLabelsPerProject: {{ osm_mcs_labels_per_project }}
+ uidAllocatorRange: "{{ osm_uid_allocator_range }}"
routingConfig:
subdomain: "{{ openshift_master_default_subdomain | default("") }}"
serviceAccountConfig: