diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-19 13:08:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 13:08:55 -0500 |
| commit | 151115eaf18d557aa8f770e61820e10bed4109bc (patch) | |
| tree | 2d8a7305669b242ec1c03a06ecb5cf3238dec688 /roles/openshift_logging_fluentd | |
| parent | 7ab8e67bfc62e16466e3fd211fded63f16583403 (diff) | |
| parent | 801779eeb6f6308f81ae7c48409de7686c04a0aa (diff) | |
| download | openshift-151115eaf18d557aa8f770e61820e10bed4109bc.tar.gz openshift-151115eaf18d557aa8f770e61820e10bed4109bc.tar.bz2 openshift-151115eaf18d557aa8f770e61820e10bed4109bc.tar.xz openshift-151115eaf18d557aa8f770e61820e10bed4109bc.zip | |
Merge pull request #6469 from mgugino-upstream-stage/plugin-consolidate
Plugin consolidate
Diffstat (limited to 'roles/openshift_logging_fluentd')
| -rw-r--r-- | roles/openshift_logging_fluentd/meta/main.yaml | 1 | ||||
| -rw-r--r-- | roles/openshift_logging_fluentd/tasks/label_and_wait.yaml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_logging_fluentd/meta/main.yaml b/roles/openshift_logging_fluentd/meta/main.yaml index 89c98204f..62f076780 100644 --- a/roles/openshift_logging_fluentd/meta/main.yaml +++ b/roles/openshift_logging_fluentd/meta/main.yaml @@ -14,3 +14,4 @@ galaxy_info: dependencies: - role: lib_openshift - role: openshift_facts +- role: lib_utils diff --git a/roles/openshift_logging_fluentd/tasks/label_and_wait.yaml b/roles/openshift_logging_fluentd/tasks/label_and_wait.yaml index 12b4f5bfd..1cef6c25e 100644 --- a/roles/openshift_logging_fluentd/tasks/label_and_wait.yaml +++ b/roles/openshift_logging_fluentd/tasks/label_and_wait.yaml @@ -4,7 +4,7 @@ name: "{{ node }}" kind: node state: add - labels: "{{ openshift_logging_fluentd_nodeselector | oo_dict_to_list_of_dict }}" + labels: "{{ openshift_logging_fluentd_nodeselector | lib_utils_oo_dict_to_list_of_dict }}" # wait half a second between labels - local_action: command sleep {{ openshift_logging_fluentd_label_delay | default('.5') }} |