summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/files/examples/v1.2/infrastructure-templates
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-03-14 09:18:38 -0400
committerScott Dodson <sdodson@redhat.com>2016-03-14 09:27:39 -0400
commit145cf0c6e25460532862a21a9a145980a810e09d (patch)
tree1f984b37f253c82e0116fc1aedb7bfc9be352a00 /roles/openshift_examples/files/examples/v1.2/infrastructure-templates
parentaf5218491dc0c25079e7b97e16a3bb56c1a1421a (diff)
downloadopenshift-145cf0c6e25460532862a21a9a145980a810e09d.tar.gz
openshift-145cf0c6e25460532862a21a9a145980a810e09d.tar.bz2
openshift-145cf0c6e25460532862a21a9a145980a810e09d.tar.xz
openshift-145cf0c6e25460532862a21a9a145980a810e09d.zip
Sync latest to v1.2
Diffstat (limited to 'roles/openshift_examples/files/examples/v1.2/infrastructure-templates')
-rw-r--r--roles/openshift_examples/files/examples/v1.2/infrastructure-templates/origin/logging-deployer.yaml7
1 files changed, 6 insertions, 1 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 4c798e148..9257b1f28 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
@@ -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"