diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-12-08 12:55:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-08 12:55:41 -0500 |
| commit | 16749761a312894d8ba1101917b7ebf430616812 (patch) | |
| tree | 1cccc66e87939cb8faccad8ba197d1a54fc2c38e /roles/openshift_master | |
| parent | 09b3183997a65c2835a95cf8c38c28e3f20380a7 (diff) | |
| parent | 7e8e98dad2adde361c7ecc6e7b043429bed6d77a (diff) | |
| download | openshift-16749761a312894d8ba1101917b7ebf430616812.tar.gz openshift-16749761a312894d8ba1101917b7ebf430616812.tar.bz2 openshift-16749761a312894d8ba1101917b7ebf430616812.tar.xz openshift-16749761a312894d8ba1101917b7ebf430616812.zip | |
Merge pull request #2902 from dgoodwin/fix-metrics-url
Fix metricsPublicURL only being set correctly on first master.
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index dc9226a5a..81546c829 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -15,8 +15,8 @@ assetConfig: {% if 'logging_public_url' in openshift.master %} loggingPublicURL: {{ openshift.master.logging_public_url }} {% endif %} -{% if 'metrics_public_url' in openshift.master %} - metricsPublicURL: {{ openshift.master.metrics_public_url }} +{% if openshift_hosted_metrics_deploy | default(false) | bool %} + metricsPublicURL: {{ openshift_hosted_metrics_public_url }} {% endif %} {% if 'extension_scripts' in openshift.master %} extensionScripts: {{ openshift.master.extension_scripts | to_padded_yaml(1, 2) }} @@ -202,7 +202,7 @@ projectConfig: mcsLabelsPerProject: {{ openshift.master.mcs_labels_per_project }} uidAllocatorRange: "{{ openshift.master.uid_allocator_range }}" routingConfig: - subdomain: "{{ openshift.master.default_subdomain | default("") }}" + subdomain: "{{ openshift_master_default_subdomain | default("") }}" serviceAccountConfig: limitSecretReferences: false managedNames: |