summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-26 09:45:40 -0500
committerGitHub <noreply@github.com>2017-01-26 09:45:40 -0500
commit0dcb6f17107ab6d726e7c22ab379387f145dc993 (patch)
tree9c3c96b4f674f34a1ae47cff34231d8251ea153d /roles/openshift_master
parent824e3a669e4683c3baf94d8f9eee168bc68afcb1 (diff)
parent944a9b750f3765df0a204b930fe57923ca58d25d (diff)
downloadopenshift-0dcb6f17107ab6d726e7c22ab379387f145dc993.tar.gz
openshift-0dcb6f17107ab6d726e7c22ab379387f145dc993.tar.bz2
openshift-0dcb6f17107ab6d726e7c22ab379387f145dc993.tar.xz
openshift-0dcb6f17107ab6d726e7c22ab379387f145dc993.zip
Merge pull request #2973 from AlbertoPeon/metrics_url
Set metrics url even if metrics_deploy is false
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index fcb8125e9..cf7ceacff 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 openshift_hosted_metrics_deploy | default(false) | bool %}
- metricsPublicURL: {{ openshift_hosted_metrics_public_url }}
+{% if openshift_hosted_metrics_deploy_url is defined %}
+ metricsPublicURL: {{ openshift_hosted_metrics_deploy_url }}
{% endif %}
{% if 'extension_scripts' in openshift.master %}
extensionScripts: {{ openshift.master.extension_scripts | to_padded_yaml(1, 2) }}