diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-05 13:26:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 13:26:55 -0500 |
| commit | 03f5d8249478ca5e62eb3d5db7aa1b7a43de96eb (patch) | |
| tree | 4f832c169d00cd8962333c29096753cb6e322b19 /roles/openshift_master | |
| parent | e64cc7d416e8121dcda25be05da9ec3c5b6899eb (diff) | |
| parent | 0de559c8f2fd310fe36047ae000574229b7858c9 (diff) | |
| download | openshift-03f5d8249478ca5e62eb3d5db7aa1b7a43de96eb.tar.gz openshift-03f5d8249478ca5e62eb3d5db7aa1b7a43de96eb.tar.bz2 openshift-03f5d8249478ca5e62eb3d5db7aa1b7a43de96eb.tar.xz openshift-03f5d8249478ca5e62eb3d5db7aa1b7a43de96eb.zip | |
Merge pull request #6306 from mgugino-upstream-stage/fix-hosted-vars
Fix hosted vars
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/meta/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_master/meta/main.yml b/roles/openshift_master/meta/main.yml index a1cda2ad4..bf0cbbf18 100644 --- a/roles/openshift_master/meta/main.yml +++ b/roles/openshift_master/meta/main.yml @@ -15,3 +15,4 @@ dependencies: - role: lib_openshift - role: lib_utils - role: lib_os_firewall +- role: openshift_facts diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index a0f00e545..f9f57bc72 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -204,7 +204,7 @@ projectConfig: mcsLabelsPerProject: {{ osm_mcs_labels_per_project }} uidAllocatorRange: "{{ osm_uid_allocator_range }}" routingConfig: - subdomain: "{{ openshift_master_default_subdomain | default("") }}" + subdomain: "{{ openshift_master_default_subdomain }}" serviceAccountConfig: limitSecretReferences: {{ openshift_master_saconfig_limitsecretreferences | default(false) }} managedNames: |