summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/files
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-05-15 00:38:19 -0400
committerJason DeTiberus <detiber@gmail.com>2016-05-15 00:38:19 -0400
commit6600c694bedf88a246c0f8a2cccb9ae3c34dc6ea (patch)
tree61dd4e03315ee9a08bc98d076c40f032d6597b2c /roles/openshift_examples/files
parenta62879b48a6f60a4cc0777ffcc9b97e919a1dce6 (diff)
parent95af21688905cfa312c160e87b276b81450c2c43 (diff)
downloadopenshift-6600c694bedf88a246c0f8a2cccb9ae3c34dc6ea.tar.gz
openshift-6600c694bedf88a246c0f8a2cccb9ae3c34dc6ea.tar.bz2
openshift-6600c694bedf88a246c0f8a2cccb9ae3c34dc6ea.tar.xz
openshift-6600c694bedf88a246c0f8a2cccb9ae3c34dc6ea.zip
Merge pull request #1891 from sosiouxme/20160613-update-logging-origin
update origin logging and metrics deployer templates
Diffstat (limited to 'roles/openshift_examples/files')
-rw-r--r--roles/openshift_examples/files/examples/v1.2/infrastructure-templates/origin/logging-deployer.yaml28
-rw-r--r--roles/openshift_examples/files/examples/v1.2/infrastructure-templates/origin/metrics-deployer.yaml2
2 files changed, 21 insertions, 9 deletions
diff --git a/roles/openshift_examples/files/examples/v1.2/infrastructure-templates/origin/logging-deployer.yaml b/roles/openshift_examples/files/examples/v1.2/infrastructure-templates/origin/logging-deployer.yaml
index cc33f77d8..fd5841db7 100644
--- a/roles/openshift_examples/files/examples/v1.2/infrastructure-templates/origin/logging-deployer.yaml
+++ b/roles/openshift_examples/files/examples/v1.2/infrastructure-templates/origin/logging-deployer.yaml
@@ -105,6 +105,10 @@ items:
value: ${IMAGE_PREFIX}
- name: IMAGE_VERSION
value: ${IMAGE_VERSION}
+ - name: IMAGE_PULL_SECRET
+ value: ${IMAGE_PULL_SECRET}
+ - name: INSECURE_REGISTRY
+ value: ${INSECURE_REGISTRY}
- name: ENABLE_OPS_CLUSTER
value: ${ENABLE_OPS_CLUSTER}
- name: KIBANA_HOSTNAME
@@ -174,14 +178,6 @@ items:
secretName: logging-deployer
parameters:
-
- description: 'Specify prefix for logging components; e.g. for "openshift/origin-logging-deployer:v1.1", set prefix "openshift/origin-"'
- name: IMAGE_PREFIX
- value: "docker.io/openshift/origin-"
- -
- description: 'Specify version for logging components; e.g. for "openshift/origin-logging-deployer:v1.1", set version "v1.1"'
- name: IMAGE_VERSION
- value: "latest"
- -
description: "If true, set up to use a second ES cluster for ops logs."
name: ENABLE_OPS_CLUSTER
value: "false"
@@ -288,3 +284,19 @@ items:
description: "The mode that the deployer runs in."
name: MODE
value: "install"
+ -
+ description: 'Specify prefix for logging components; e.g. for "openshift/origin-logging-deployer:v1.1", set prefix "openshift/origin-"'
+ name: IMAGE_PREFIX
+ value: "docker.io/openshift/origin-"
+ -
+ description: 'Specify version for logging components; e.g. for "openshift/origin-logging-deployer:v1.1", set version "v1.1"'
+ name: IMAGE_VERSION
+ value: "latest"
+ -
+ description: 'Specify the name of an existing pull secret to be used for pulling component images from an authenticated registry.'
+ name: IMAGE_PULL_SECRET
+ -
+ description: 'Allow the registry for logging component images to be non-secure (not secured with a certificate signed by a known CA)'
+ name: INSECURE_REGISTRY
+ value: "false"
+
diff --git a/roles/openshift_examples/files/examples/v1.2/infrastructure-templates/origin/metrics-deployer.yaml b/roles/openshift_examples/files/examples/v1.2/infrastructure-templates/origin/metrics-deployer.yaml
index c620c46ec..8fb594ce8 100644
--- a/roles/openshift_examples/files/examples/v1.2/infrastructure-templates/origin/metrics-deployer.yaml
+++ b/roles/openshift_examples/files/examples/v1.2/infrastructure-templates/origin/metrics-deployer.yaml
@@ -91,7 +91,7 @@ parameters:
-
description: 'Specify version for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set version "latest"'
name: IMAGE_VERSION
- value: "v0.1.0"
+ value: "latest"
-
description: "Internal URL for the master, for authentication retrieval"
name: MASTER_URL