diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-28 19:47:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-28 19:47:21 -0800 |
| commit | 8f9f84b27ce12d07eed2269df0a118f112554f7a (patch) | |
| tree | 881e768611b8bfbc91d4ae0945196dff50e8b10b /roles/openshift_master | |
| parent | b7af6f115dd73cb7706fd76cd13fcd63aead7630 (diff) | |
| parent | 42f206740d3b065ebdbc95f12315f922a1d70c7d (diff) | |
| download | openshift-8f9f84b27ce12d07eed2269df0a118f112554f7a.tar.gz openshift-8f9f84b27ce12d07eed2269df0a118f112554f7a.tar.bz2 openshift-8f9f84b27ce12d07eed2269df0a118f112554f7a.tar.xz openshift-8f9f84b27ce12d07eed2269df0a118f112554f7a.zip | |
Merge pull request #6301 from mgugino-upstream-stage/project_cfg_facts
Automatic merge from submit-queue.
Remove openshift_facts project_cfg_facts
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/defaults/main.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 12 |
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: |