diff options
author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-14 11:56:09 -0400 |
---|---|---|
committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-14 11:56:09 -0400 |
commit | 00ccce6741369f5cffdcca2a9511c57e3aff4b47 (patch) | |
tree | 02576ace505cc387703255484dec9f8ac1d0dac4 /roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/logging-deployer.yaml | |
parent | a0e7f19f9f7f423d8fe001a247ccf2c98d815d68 (diff) | |
parent | 145cf0c6e25460532862a21a9a145980a810e09d (diff) | |
download | openshift-00ccce6741369f5cffdcca2a9511c57e3aff4b47.tar.gz openshift-00ccce6741369f5cffdcca2a9511c57e3aff4b47.tar.bz2 openshift-00ccce6741369f5cffdcca2a9511c57e3aff4b47.tar.xz openshift-00ccce6741369f5cffdcca2a9511c57e3aff4b47.zip |
Merge pull request #1451 from sdodson/is-sync
Sync with latest image stream and templates
Diffstat (limited to 'roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/logging-deployer.yaml')
-rw-r--r-- | roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/logging-deployer.yaml | 7 |
1 files changed, 6 insertions, 1 deletions
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" |