diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-16 09:47:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-16 09:47:51 -0500 |
| commit | bf6c877eb0261617e0be424b24d7e13b6677cba9 (patch) | |
| tree | 80507b759059829e009cc81f226ebdf185a580f1 /roles/openshift_logging/tasks | |
| parent | bdbb8d2ec6e81ec0eb8b5b5c512583392af2004d (diff) | |
| parent | 42cda5ca1d0ec0017b37ac288aefa74ca92ab640 (diff) | |
| download | openshift-bf6c877eb0261617e0be424b24d7e13b6677cba9.tar.gz openshift-bf6c877eb0261617e0be424b24d7e13b6677cba9.tar.bz2 openshift-bf6c877eb0261617e0be424b24d7e13b6677cba9.tar.xz openshift-bf6c877eb0261617e0be424b24d7e13b6677cba9.zip | |
Merge pull request #3373 from ewolinetz/logging_fix_kibana_routes
Fixing default for logging
Diffstat (limited to 'roles/openshift_logging/tasks')
| -rw-r--r-- | roles/openshift_logging/tasks/generate_secrets.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/start_cluster.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/stop_cluster.yaml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_logging/tasks/generate_secrets.yaml b/roles/openshift_logging/tasks/generate_secrets.yaml index 1829acaee..81fac8b5e 100644 --- a/roles/openshift_logging/tasks/generate_secrets.yaml +++ b/roles/openshift_logging/tasks/generate_secrets.yaml @@ -17,7 +17,7 @@ - name: Generating secrets for logging components template: src=secret.j2 dest={{mktemp.stdout}}/templates/{{secret_name}}-secret.yaml vars: - secret_name: logging-{{component}} + secret_name: "logging-{{component}}" secret_key_file: "{{component}}_key" secret_cert_file: "{{component}}_cert" secrets: diff --git a/roles/openshift_logging/tasks/start_cluster.yaml b/roles/openshift_logging/tasks/start_cluster.yaml index 3e97487dc..edbb62c3e 100644 --- a/roles/openshift_logging/tasks/start_cluster.yaml +++ b/roles/openshift_logging/tasks/start_cluster.yaml @@ -16,7 +16,7 @@ name: "{{ fluentd_host }}" kind: node state: add - label: "{{ openshift_logging_fluentd_nodeselector | oo_dict_to_list_of_dict }}" + labels: "{{ openshift_logging_fluentd_nodeselector | oo_dict_to_list_of_dict }}" with_items: "{{ openshift_logging_fluentd_hosts }}" loop_control: loop_var: fluentd_host diff --git a/roles/openshift_logging/tasks/stop_cluster.yaml b/roles/openshift_logging/tasks/stop_cluster.yaml index bae6aebbb..4b3722e29 100644 --- a/roles/openshift_logging/tasks/stop_cluster.yaml +++ b/roles/openshift_logging/tasks/stop_cluster.yaml @@ -16,7 +16,7 @@ name: "{{ fluentd_host }}" kind: node state: absent - label: "{{ openshift_logging_fluentd_nodeselector | oo_dict_to_list_of_dict }}" + labels: "{{ openshift_logging_fluentd_nodeselector | oo_dict_to_list_of_dict }}" with_items: "{{ openshift_logging_fluentd_hosts }}" loop_control: loop_var: fluentd_host |