summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Tescher <pat2man@gmail.com>2017-05-17 12:49:47 -0700
committerPatrick Tescher <pat2man@gmail.com>2017-05-17 21:43:20 -0700
commit35dc9a8d93a39538787cbf4b2bef8463f6188573 (patch)
treeb759f69ce4b90fc56c04ff8480468f17a4a92cbd
parent9c05f942003db63ea40103c6c25cf6bc42658308 (diff)
downloadopenshift-35dc9a8d93a39538787cbf4b2bef8463f6188573.tar.gz
openshift-35dc9a8d93a39538787cbf4b2bef8463f6188573.tar.bz2
openshift-35dc9a8d93a39538787cbf4b2bef8463f6188573.tar.xz
openshift-35dc9a8d93a39538787cbf4b2bef8463f6188573.zip
Update hosts.*.example to include openshift_hosted_metrics_deployer_version
Without this we can have a mismatch between the OpenShift version and the metrics version. Fixes https://github.com/openshift/origin/issues/13532
-rw-r--r--inventory/byo/hosts.origin.example3
-rw-r--r--inventory/byo/hosts.ose.example3
2 files changed, 6 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index 20f342023..831bb4f6d 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -521,6 +521,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# 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 prefix and version for the component images
+#openshift_hosted_metrics_deployer_prefix=docker.io/openshift/origin-
+#openshift_hosted_metrics_deployer_version=3.6.0
# Logging deployment
#
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index f75a47bb8..ffc56a073 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -522,6 +522,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# 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 prefix and version for the component images
+#openshift_hosted_metrics_deployer_prefix=registry.example.com:8888/openshift3/
+#openshift_hosted_metrics_deployer_version=3.6.0
# Logging deployment
#