diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-10-07 15:50:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-07 15:50:34 -0400 |
| commit | 631890709850fb957b08f8443f9c481d99554a64 (patch) | |
| tree | 9f1279d0270fa8fc923db2d7389ce3a86ed90ffb /roles/openshift_hosted_logging | |
| parent | 2cf43b8cf6a2f925b03585c16dbf451cb4cbb23c (diff) | |
| parent | 18e86fba21160c01f5a33b39ce5d1aee92e3c494 (diff) | |
| download | openshift-631890709850fb957b08f8443f9c481d99554a64.tar.gz openshift-631890709850fb957b08f8443f9c481d99554a64.tar.bz2 openshift-631890709850fb957b08f8443f9c481d99554a64.tar.xz openshift-631890709850fb957b08f8443f9c481d99554a64.zip | |
Merge pull request #2569 from sdodson/logging
[logging] Fix openshift_hosted_logging_fluentd_nodeselector
Diffstat (limited to 'roles/openshift_hosted_logging')
| -rw-r--r-- | roles/openshift_hosted_logging/tasks/deploy_logging.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_hosted_logging/tasks/deploy_logging.yaml b/roles/openshift_hosted_logging/tasks/deploy_logging.yaml index f64c56248..65af1c08e 100644 --- a/roles/openshift_hosted_logging/tasks/deploy_logging.yaml +++ b/roles/openshift_hosted_logging/tasks/deploy_logging.yaml @@ -138,7 +138,7 @@ delay: 5 - name: "Deploy fluentd by labeling the node" - shell: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig label node --overwrite=true {{ '-l openshift_hosted_logging_fluentd_nodeselector' if openshift_hosted_logging_fluentd_nodeselector is defined else '--all' }} {{ openshift_hosted_logging_fluentd_nodeselector_label if openshift_hosted_logging_fluentd_nodeselector_label is defined else 'logging-infra-fluentd=true' }}" + shell: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig label node --overwrite=true {{ '-l' ~ openshift_hosted_logging_fluentd_nodeselector if openshift_hosted_logging_fluentd_nodeselector is defined else '--all' }} {{ openshift_hosted_logging_fluentd_nodeselector_label if openshift_hosted_logging_fluentd_nodeselector_label is defined else 'logging-infra-fluentd=true' }}" - name: "Wait for fluentd to be running" shell: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig get pods -l component=fluentd | grep Running" |