summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-09-21 11:43:54 -0400
committerGitHub <noreply@github.com>2016-09-21 11:43:54 -0400
commitcae0ff6c74d9352d7abc1414d1f1f67f454c9803 (patch)
tree8b61a730264107e10b71b8546614cc5fd2bdbeff
parenteccf065ce5c819d5a1a75bf613149b454fc3ceda (diff)
parent29a08fe107f806610221d50a4bb6d9647653d1bd (diff)
downloadopenshift-cae0ff6c74d9352d7abc1414d1f1f67f454c9803.tar.gz
openshift-cae0ff6c74d9352d7abc1414d1f1f67f454c9803.tar.bz2
openshift-cae0ff6c74d9352d7abc1414d1f1f67f454c9803.tar.xz
openshift-cae0ff6c74d9352d7abc1414d1f1f67f454c9803.zip
Merge pull request #2486 from sdodson/metrics-public-url
Clarify openshift_hosted_metrics_public_url
-rw-r--r--inventory/byo/hosts.origin.example2
-rw-r--r--inventory/byo/hosts.ose.example2
2 files changed, 4 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index 41ed237f7..bfef467f9 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -364,6 +364,8 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
#
# Override metricsPublicURL in the master config for cluster metrics
# Defaults to https://hawkular-metrics.{{openshift_master_default_subdomain}}/hawkular/metrics
+# Currently, you may only alter the hostname portion of the url, alterting the
+# `/hawkular/metrics` path will break installation of metrics.
#openshift_hosted_metrics_public_url=https://hawkular-metrics.example.com/hawkular/metrics
# Configure the multi-tenant SDN plugin (default is 'redhat/openshift-ovs-subnet')
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index 71e1ebb03..6e04f7d8e 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -363,6 +363,8 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
#
# Override metricsPublicURL in the master config for cluster metrics
# Defaults to https://hawkular-metrics.{{openshift_master_default_subdomain}}/hawkular/metrics
+# Currently, you may only alter the hostname portion of the url, alterting the
+# `/hawkular/metrics` path will break installation of metrics.
#openshift_hosted_metrics_public_url=https://hawkular-metrics.example.com/hawkular/metrics