summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-30 08:19:05 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-30 08:19:05 -0500
commit50ba48498269d5d1e063684d3d5c968f7a173fd9 (patch)
tree8f0eda8fd1ceba0e62d4c68f75187952bac0bfa7 /roles/openshift_examples
parente3071fd15f70214fe9f13b847f2cc5443716d955 (diff)
parentd94e2fe8c6440c7445767a84c399abd5c1a2d346 (diff)
downloadopenshift-50ba48498269d5d1e063684d3d5c968f7a173fd9.tar.gz
openshift-50ba48498269d5d1e063684d3d5c968f7a173fd9.tar.bz2
openshift-50ba48498269d5d1e063684d3d5c968f7a173fd9.tar.xz
openshift-50ba48498269d5d1e063684d3d5c968f7a173fd9.zip
Merge pull request #976 from sdodson/fix-enterprise-metrics
Point enterprise metrics templates at registry.access.redhat.com/openshift3/met…
Diffstat (limited to 'roles/openshift_examples')
-rw-r--r--roles/openshift_examples/files/examples/v1.0/infrastructure-templates/enterprise/metrics-deployer.yaml4
-rw-r--r--roles/openshift_examples/files/examples/v1.1/infrastructure-templates/enterprise/metrics-deployer.yaml4
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_examples/files/examples/v1.0/infrastructure-templates/enterprise/metrics-deployer.yaml b/roles/openshift_examples/files/examples/v1.0/infrastructure-templates/enterprise/metrics-deployer.yaml
index d823b2587..ddd9f2f75 100644
--- a/roles/openshift_examples/files/examples/v1.0/infrastructure-templates/enterprise/metrics-deployer.yaml
+++ b/roles/openshift_examples/files/examples/v1.0/infrastructure-templates/enterprise/metrics-deployer.yaml
@@ -81,11 +81,11 @@ parameters:
-
description: 'Specify prefix for metrics components; e.g. for "openshift/origin-metrics-deployer:v1.1", set prefix "openshift/origin-"'
name: IMAGE_PREFIX
- value: "hawkular/"
+ value: "registry.access.redhat.com/openshift3/"
-
description: 'Specify version for metrics components; e.g. for "openshift/origin-metrics-deployer:v1.1", set version "v1.1"'
name: IMAGE_VERSION
- value: "0.7.0-SNAPSHOT"
+ value: "3.1.0"
-
description: "Internal URL for the master, for authentication retrieval"
name: MASTER_URL
diff --git a/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/enterprise/metrics-deployer.yaml b/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/enterprise/metrics-deployer.yaml
index d823b2587..ddd9f2f75 100644
--- a/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/enterprise/metrics-deployer.yaml
+++ b/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/enterprise/metrics-deployer.yaml
@@ -81,11 +81,11 @@ parameters:
-
description: 'Specify prefix for metrics components; e.g. for "openshift/origin-metrics-deployer:v1.1", set prefix "openshift/origin-"'
name: IMAGE_PREFIX
- value: "hawkular/"
+ value: "registry.access.redhat.com/openshift3/"
-
description: 'Specify version for metrics components; e.g. for "openshift/origin-metrics-deployer:v1.1", set version "v1.1"'
name: IMAGE_VERSION
- value: "0.7.0-SNAPSHOT"
+ value: "3.1.0"
-
description: "Internal URL for the master, for authentication retrieval"
name: MASTER_URL