Sync with latest image stream and templates

3 files changed, 13 insertions, 12 deletions

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 be999bd1a..99f2df4fa 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
@@ -52,8 +52,6 @@ objects:
           value: ${IMAGE_PREFIX}
         - name: IMAGE_VERSION
           value: ${IMAGE_VERSION}
-        - name: PUBLIC_MASTER_URL
-          value: ${PUBLIC_MASTER_URL}
         - name: MASTER_URL
           value: ${MASTER_URL}
         - name: REDEPLOY
@@ -79,11 +77,11 @@ objects:
         secretName: metrics-deployer
 parameters:
 -
-  description: 'Specify prefix for metrics components; e.g. for "openshift/origin-metrics-deployer:v1.1", set prefix "openshift/origin-"'
+  description: 'Specify prefix for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set prefix "openshift/origin-"'
   name: IMAGE_PREFIX
   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"'
+  description: 'Specify version for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set version "latest"'
   name: IMAGE_VERSION
   value: "3.1.1"
 -
@@ -109,7 +107,7 @@ parameters:
 -
   description: "The persistent volume size for each of the Cassandra nodes"
   name: CASSANDRA_PV_SIZE
-  value: "1Gi"
+  value: "10Gi"
 -
   description: "How many days metrics should be stored for."
   name: METRIC_DURATION
diff --git a/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/logging-deployer.yaml b/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/logging-deployer.yaml
index 4c798e148..9257b1f28 100644
--- a/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/logging-deployer.yaml
+++ b/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/logging-deployer.yaml
@@ -69,6 +69,8 @@ objects:
           value: ${ES_OPS_RECOVER_EXPECTED_NODES}
         - name: ES_OPS_RECOVER_AFTER_TIME
           value: ${ES_OPS_RECOVER_AFTER_TIME}
+        - name: FLUENTD_NODESELECTOR
+          value: ${FLUENTD_NODESELECTOR}
     dnsPolicy: ClusterFirst
     restartPolicy: Never
     serviceAccount: logging-deployer
@@ -148,4 +150,7 @@ parameters:
   description: "Timeout for *expected* ops nodes to be present when cluster is recovering from a full restart."
   name: ES_OPS_RECOVER_AFTER_TIME
   value: "5m"
-
+-
+  description: "The nodeSelector used for the Fluentd DaemonSet."
+  name: FLUENTD_NODESELECTOR
+  value: "logging-infra-fluentd=true"
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 3e9bcde5b..30d79acee 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
@@ -52,8 +52,6 @@ objects:
           value: ${IMAGE_PREFIX}
         - name: IMAGE_VERSION
           value: ${IMAGE_VERSION}
-        - name: PUBLIC_MASTER_URL
-          value: ${PUBLIC_MASTER_URL}
         - name: MASTER_URL
           value: ${MASTER_URL}
         - name: REDEPLOY
@@ -79,11 +77,11 @@ objects:
         secretName: metrics-deployer
 parameters:
 -
-  description: 'Specify prefix for metrics components; e.g. for "openshift/origin-metrics-deployer:v1.1", set prefix "openshift/origin-"'
+  description: 'Specify prefix for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set prefix "openshift/origin-"'
   name: IMAGE_PREFIX
-  value: "docker.io/openshift/origin-"
+  value: "openshift/origin-"
 -
-  description: 'Specify version for metrics components; e.g. for "openshift/origin-metrics-deployer:v1.1", set version "v1.1"'
+  description: 'Specify version for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set version "latest"'
   name: IMAGE_VERSION
   value: "latest"
 -
@@ -109,7 +107,7 @@ parameters:
 -
   description: "The persistent volume size for each of the Cassandra nodes"
   name: CASSANDRA_PV_SIZE
-  value: "1Gi"
+  value: "10Gi"
 -
   description: "How many days metrics should be stored for."
   name: METRIC_DURATION