summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-09-27 14:01:46 -0400
committerGitHub <noreply@github.com>2016-09-27 14:01:46 -0400
commit43f52e292afac7bde5e588377e56d9c49574806c (patch)
tree6de9a8b3c7e205175c658011a0f7717242d2e191
parentbd7363f4b64181dee300a85775b484ffa6f45917 (diff)
parent89a7b6d3bdd4af8b814085d2235b9ee2b28e41e1 (diff)
downloadopenshift-43f52e292afac7bde5e588377e56d9c49574806c.tar.gz
openshift-43f52e292afac7bde5e588377e56d9c49574806c.tar.bz2
openshift-43f52e292afac7bde5e588377e56d9c49574806c.tar.xz
openshift-43f52e292afac7bde5e588377e56d9c49574806c.zip
Merge pull request #2508 from sdodson/fix-logging-template
Fix deployer template for enterprise
-rw-r--r--roles/openshift_examples/files/examples/v1.3/infrastructure-templates/enterprise/logging-deployer.yaml5
1 files changed, 2 insertions, 3 deletions
diff --git a/roles/openshift_examples/files/examples/v1.3/infrastructure-templates/enterprise/logging-deployer.yaml b/roles/openshift_examples/files/examples/v1.3/infrastructure-templates/enterprise/logging-deployer.yaml
index b9835e7e9..a8d4b1cbb 100644
--- a/roles/openshift_examples/files/examples/v1.3/infrastructure-templates/enterprise/logging-deployer.yaml
+++ b/roles/openshift_examples/files/examples/v1.3/infrastructure-templates/enterprise/logging-deployer.yaml
@@ -202,11 +202,11 @@ items:
-
description: 'Specify prefix for logging components; e.g. for "registry.access.redhat.com/openshift3/logging-deployer:3.3.0", set prefix "registry.access.redhat.com/openshift3/"'
name: IMAGE_PREFIX
- value: "docker.io/openshift/origin-"
+ value: "registry.access.redhat.com/openshift3/"
-
description: 'Specify version for logging components; e.g. for "registry.access.redhat.com/openshift3/logging-deployer:3.3.0", set version "3.3.0"'
name: IMAGE_VERSION
- value: "latest"
+ value: "3.3.0"
-
description: "(Deprecated) Specify the name of an existing pull secret to be used for pulling component images from an authenticated registry."
name: IMAGE_PULL_SECRET
@@ -323,4 +323,3 @@ items:
description: "(Deprecated) Node selector operations Curator (label=value)."
name: CURATOR_OPS_NODESELECTOR
value: ""
-