diff options
author | ewolinetz <ewolinet@redhat.com> | 2017-05-02 11:21:56 -0500 |
---|---|---|
committer | ewolinetz <ewolinet@redhat.com> | 2017-05-22 10:42:52 -0500 |
commit | 60ad4626f03cbfb119290a4bfaf9ecba53dc762b (patch) | |
tree | 766cafb64b81d26ba9cad66e84153248aad7141a /roles/openshift_logging_fluentd/tasks | |
parent | a8e826248539179c5ef69ec003701be608e89b70 (diff) | |
download | openshift-60ad4626f03cbfb119290a4bfaf9ecba53dc762b.tar.gz openshift-60ad4626f03cbfb119290a4bfaf9ecba53dc762b.tar.bz2 openshift-60ad4626f03cbfb119290a4bfaf9ecba53dc762b.tar.xz openshift-60ad4626f03cbfb119290a4bfaf9ecba53dc762b.zip |
Pulling in changes from master
Diffstat (limited to 'roles/openshift_logging_fluentd/tasks')
-rw-r--r-- | roles/openshift_logging_fluentd/tasks/main.yaml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/roles/openshift_logging_fluentd/tasks/main.yaml b/roles/openshift_logging_fluentd/tasks/main.yaml index 0e14328c0..d350eb41e 100644 --- a/roles/openshift_logging_fluentd/tasks/main.yaml +++ b/roles/openshift_logging_fluentd/tasks/main.yaml @@ -40,7 +40,7 @@ oc_serviceaccount: state: present name: "aggregated-logging-fluentd" - namespace: "{{ openshift_logging_namespace }}" + namespace: "{{ openshift_logging_fluentd_namespace }}" image_pull_secrets: "{{ openshift_logging_image_pull_secret }}" when: openshift_logging_image_pull_secret != '' @@ -48,27 +48,27 @@ oc_serviceaccount: state: present name: "aggregated-logging-fluentd" - namespace: "{{ openshift_logging_namespace }}" + namespace: "{{ openshift_logging_fluentd_namespace }}" when: - openshift_logging_image_pull_secret == '' # set service account scc - name: Set privileged permissions for Fluentd oc_adm_policy_user: - namespace: "{{ openshift_logging_namespace }}" + namespace: "{{ openshift_logging_fluentd_namespace }}" resource_kind: scc resource_name: privileged state: present - user: "system:serviceaccount:{{ openshift_logging_namespace }}:aggregated-logging-fluentd" + user: "system:serviceaccount:{{ openshift_logging_fluentd_namespace }}:aggregated-logging-fluentd" # set service account permissions - name: Set cluster-reader permissions for Fluentd oc_adm_policy_user: - namespace: "{{ openshift_logging_namespace }}" + namespace: "{{ openshift_logging_fluentd_namespace }}" resource_kind: cluster-role resource_name: cluster-reader state: present - user: "system:serviceaccount:{{ openshift_logging_namespace }}:aggregated-logging-fluentd" + user: "system:serviceaccount:{{ openshift_logging_fluentd_namespace }}:aggregated-logging-fluentd" # create Fluentd configmap - template: @@ -114,9 +114,9 @@ oc_configmap: state: present name: "logging-fluentd" - namespace: "{{ openshift_logging_namespace }}" + namespace: "{{ openshift_logging_fluentd_namespace }}" from_file: - fluentd.conf: "{{ tempdir }}/fluent.conf" + fluent.conf: "{{ tempdir }}/fluent.conf" throttle-config.yaml: "{{ tempdir }}/fluentd-throttle-config.yaml" secure-forward.conf: "{{ tempdir }}/secure-forward.conf" @@ -126,7 +126,7 @@ oc_secret: state: present name: logging-fluentd - namespace: "{{ openshift_logging_namespace }}" + namespace: "{{ openshift_logging_fluentd_namespace }}" files: - name: ca path: "{{ generated_certs_dir }}/ca.crt" @@ -161,7 +161,7 @@ oc_obj: state: present name: logging-fluentd - namespace: "{{ openshift_logging_namespace }}" + namespace: "{{ openshift_logging_fluentd_namespace }}" kind: daemonset files: - "{{ tempdir }}/templates/logging-fluentd.yaml" |