diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-30 11:41:08 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-30 11:41:08 -0500 |
| commit | 2dacc6226aeb79f0cf75725f5164fffe05208e58 (patch) | |
| tree | 20e6ce2dfa2d1776a5a1b42b5b133d5bb3fee2cb | |
| parent | f790d7d49055b3eeb382fa4e90884f73162849cc (diff) | |
| parent | a1a860134f0354844ce2bb2de959323cd1a57bfd (diff) | |
| download | openshift-2dacc6226aeb79f0cf75725f5164fffe05208e58.tar.gz openshift-2dacc6226aeb79f0cf75725f5164fffe05208e58.tar.bz2 openshift-2dacc6226aeb79f0cf75725f5164fffe05208e58.tar.xz openshift-2dacc6226aeb79f0cf75725f5164fffe05208e58.zip | |
Merge pull request #998 from nak3/hawkular-fix
Update IMAGE_PREFIX and IMAGE_VERSION values in hawkular template
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_examples/files/examples/v1.0/infrastructure-templates/origin/metrics-deployer.yaml b/roles/openshift_examples/files/examples/v1.0/infrastructure-templates/origin/metrics-deployer.yaml index d823b2587..3e9bcde5b 100644 --- a/roles/openshift_examples/files/examples/v1.0/infrastructure-templates/origin/metrics-deployer.yaml +++ b/roles/openshift_examples/files/examples/v1.0/infrastructure-templates/origin/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: "docker.io/openshift/origin-" - 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: "latest" - description: "Internal URL for the master, for authentication retrieval" name: MASTER_URL diff --git a/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/metrics-deployer.yaml b/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/metrics-deployer.yaml index d823b2587..3e9bcde5b 100644 --- a/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/metrics-deployer.yaml +++ b/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/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: "docker.io/openshift/origin-" - 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: "latest" - description: "Internal URL for the master, for authentication retrieval" name: MASTER_URL |