Addressing tox errors

roles/openshift_logging_curator/tasks/main.yaml

@@ -48,7 +48,7 @@
     name: "aggregated-logging-curator"
     namespace: "{{ openshift_logging_namespace }}"
   when:
-  - openshift_logging_image_pull_secret == ''
+    - openshift_logging_image_pull_secret == ''
 
 # configmap
 - copy:
@@ -78,12 +78,12 @@
     name: "logging-curator"
     namespace: "{{ openshift_logging_namespace }}"
     files:
-    - name: ca
-      path: "{{ generated_certs_dir }}/ca.crt"
-    - name: key
-      path: "{{ generated_certs_dir }}/system.logging.curator.key"
-    - name: cert
-      path: "{{ generated_certs_dir }}/system.logging.curator.crt"
+      - name: ca
+        path: "{{ generated_certs_dir }}/ca.crt"
+      - name: key
+        path: "{{ generated_certs_dir }}/system.logging.curator.key"
+      - name: cert
+        path: "{{ generated_certs_dir }}/system.logging.curator.crt"
 
 - set_fact:
     curator_name: "{{ 'logging-curator' ~ ( (openshift_logging_curator_ops_deployment | default(false) | bool) | ternary('-ops', '') ) }}"
@@ -117,7 +117,7 @@
     namespace: "{{ openshift_logging_namespace }}"
     kind: dc
     files:
-    - "{{ tempdir }}/templates/curator-dc.yaml"
+      - "{{ tempdir }}/templates/curator-dc.yaml"
     delete_after: true
 
 - name: Delete temp directory

roles/openshift_logging_fluentd/tasks/main.yaml

@@ -82,7 +82,7 @@
     name: "aggregated-logging-fluentd"
     namespace: "{{ openshift_logging_fluentd_namespace }}"
   when:
-  - openshift_logging_image_pull_secret == ''
+    - openshift_logging_image_pull_secret == ''
 
 # set service account scc
 - name: Set privileged permissions for Fluentd
@@ -159,12 +159,12 @@
     name: logging-fluentd
     namespace: "{{ openshift_logging_fluentd_namespace }}"
     files:
-    - name: ca
-      path: "{{ generated_certs_dir }}/ca.crt"
-    - name: key
-      path: "{{ generated_certs_dir }}/system.logging.fluentd.key"
-    - name: cert
-      path: "{{ generated_certs_dir }}/system.logging.fluentd.crt"
+      - name: ca
+        path: "{{ generated_certs_dir }}/ca.crt"
+      - name: key
+        path: "{{ generated_certs_dir }}/system.logging.fluentd.key"
+      - name: cert
+        path: "{{ generated_certs_dir }}/system.logging.fluentd.crt"
 
 # create Fluentd daemonset
 # this should change based on the type of fluentd deployment to be done...
@@ -200,7 +200,7 @@
     namespace: "{{ openshift_logging_fluentd_namespace }}"
     kind: daemonset
     files:
-    - "{{ tempdir }}/templates/logging-fluentd.yaml"
+      - "{{ tempdir }}/templates/logging-fluentd.yaml"
     delete_after: true
 
 # Scale up Fluentd

roles/openshift_logging_kibana/tasks/main.yaml

@@ -51,7 +51,7 @@
     name: "aggregated-logging-kibana"
     namespace: "{{ openshift_logging_namespace }}"
   when:
-  - openshift_logging_image_pull_secret == ''
+    - openshift_logging_image_pull_secret == ''
 
 - set_fact:
     kibana_name: "{{ 'logging-kibana' ~ ( (openshift_logging_kibana_ops_deployment | default(false) | bool) | ternary('-ops', '')) }}"
@@ -72,7 +72,7 @@
     content: "{{ 200 | oo_random_word }}"
     dest: "{{ generated_certs_dir }}/session_secret"
   when:
-  - not session_secret_file.stat.exists
+    - not session_secret_file.stat.exists
 
 # gen oauth_secret if necessary
 - name: Generate oauth secret
@@ -80,19 +80,19 @@
     content: "{{ 64 | oo_random_word }}"
     dest: "{{ generated_certs_dir }}/oauth_secret"
   when:
-  - not oauth_secret_file.stat.exists
+    - not oauth_secret_file.stat.exists
 
 - name: Retrieving the cert to use when generating secrets for the logging components
   slurp:
     src: "{{ generated_certs_dir }}/{{ item.file }}"
   register: key_pairs
   with_items:
-  - { name: "ca_file", file: "ca.crt" }
-  - { name: "kibana_internal_key", file: "kibana-internal.key"}
-  - { name: "kibana_internal_cert", file: "kibana-internal.crt"}
-  - { name: "server_tls", file: "server-tls.json"}
-  - { name: "session_secret", file: "session_secret" }
-  - { name: "oauth_secret", file: "oauth_secret" }
+    - { name: "ca_file", file: "ca.crt" }
+    - { name: "kibana_internal_key", file: "kibana-internal.key"}
+    - { name: "kibana_internal_cert", file: "kibana-internal.crt"}
+    - { name: "server_tls", file: "server-tls.json"}
+    - { name: "session_secret", file: "session_secret" }
+    - { name: "oauth_secret", file: "oauth_secret" }
 
 # services
 - name: Set {{ kibana_name }} service
@@ -106,8 +106,8 @@
     labels:
       logging-infra: 'support'
     ports:
-    - port: 443
-      targetPort: "oaproxy"
+      - port: 443
+        targetPort: "oaproxy"
 
 # create routes
 # TODO: set up these certs differently?
@@ -158,7 +158,7 @@
     namespace: "{{ openshift_logging_namespace }}"
     kind: route
     files:
-    - "{{ tempdir }}/templates/kibana-route.yaml"
+      - "{{ tempdir }}/templates/kibana-route.yaml"
 
 # preserve list of current hostnames
 - name: Get current oauthclient hostnames
@@ -187,7 +187,7 @@
     namespace: "{{ openshift_logging_namespace }}"
     kind: oauthclient
     files:
-    - "{{ tempdir }}/templates/oauth-client.yml"
+      - "{{ tempdir }}/templates/oauth-client.yml"
     delete_after: true
 
 # create Kibana secret
@@ -197,12 +197,12 @@
     name: "logging-kibana"
     namespace: "{{ openshift_logging_namespace }}"
     files:
-    - name: ca
-      path: "{{ generated_certs_dir }}/ca.crt"
-    - name: key
-      path: "{{ generated_certs_dir }}/system.logging.kibana.key"
-    - name: cert
-      path: "{{ generated_certs_dir }}/system.logging.kibana.crt"
+      - name: ca
+        path: "{{ generated_certs_dir }}/ca.crt"
+      - name: key
+        path: "{{ generated_certs_dir }}/system.logging.kibana.key"
+      - name: cert
+        path: "{{ generated_certs_dir }}/system.logging.kibana.crt"
 
 # create Kibana-proxy secret
 - name: Set Kibana Proxy secret
@@ -219,16 +219,16 @@
     #- name: server-tls.json
     #  path: "{{ generated_certs_dir }}/server-tls.json"
     contents:
-    - path: oauth-secret
-      data: "{{ key_pairs | entry_from_named_pair('oauth_secret') | b64decode }}"
-    - path: session-secret
-      data: "{{ key_pairs | entry_from_named_pair('session_secret') | b64decode }}"
-    - path: server-key
-      data: "{{ key_pairs | entry_from_named_pair('kibana_internal_key') | b64decode }}"
-    - path: server-cert
-      data: "{{ key_pairs | entry_from_named_pair('kibana_internal_cert') | b64decode }}"
-    - path: server-tls.json
-      data: "{{ key_pairs | entry_from_named_pair('server_tls') | b64decode }}"
+      - path: oauth-secret
+        data: "{{ key_pairs | entry_from_named_pair('oauth_secret') | b64decode }}"
+      - path: session-secret
+        data: "{{ key_pairs | entry_from_named_pair('session_secret') | b64decode }}"
+      - path: server-key
+        data: "{{ key_pairs | entry_from_named_pair('kibana_internal_key') | b64decode }}"
+      - path: server-cert
+        data: "{{ key_pairs | entry_from_named_pair('kibana_internal_cert') | b64decode }}"
+      - path: server-tls.json
+        data: "{{ key_pairs | entry_from_named_pair('server_tls') | b64decode }}"
 
 # create Kibana DC
 - name: Generate Kibana DC template
@@ -259,7 +259,7 @@
     namespace: "{{ openshift_logging_namespace }}"
     kind: dc
     files:
-    - "{{ tempdir }}/templates/kibana-dc.yaml"
+      - "{{ tempdir }}/templates/kibana-dc.yaml"
     delete_after: true
 
 # update master configs?

roles/openshift_logging_mux/tasks/main.yaml

@@ -55,7 +55,7 @@
     name: "aggregated-logging-mux"
     namespace: "{{ openshift_logging_mux_namespace }}"
   when:
-  - openshift_logging_image_pull_secret == ''
+    - openshift_logging_image_pull_secret == ''
 
 # set service account scc
 - name: Set privileged permissions for Mux
@@ -125,14 +125,14 @@
     name: logging-mux
     namespace: "{{ openshift_logging_mux_namespace }}"
     files:
-    - name: ca
-      path: "{{ generated_certs_dir }}/ca.crt"
-    - name: key
-      path: "{{ generated_certs_dir }}/system.logging.mux.key"
-    - name: cert
-      path: "{{ generated_certs_dir }}/system.logging.mux.crt"
-    - name: shared_key
-      path: "{{ generated_certs_dir }}/mux_shared_key"
+      - name: ca
+        path: "{{ generated_certs_dir }}/ca.crt"
+      - name: key
+        path: "{{ generated_certs_dir }}/system.logging.mux.key"
+      - name: cert
+        path: "{{ generated_certs_dir }}/system.logging.mux.crt"
+      - name: shared_key
+        path: "{{ generated_certs_dir }}/mux_shared_key"
 
 # services
 - name: Set logging-mux service for external communication
@@ -146,11 +146,11 @@
     labels:
       logging-infra: 'support'
     ports:
-    - name: mux-forward
-      port: "{{ openshift_logging_mux_port }}"
-      targetPort: "mux-forward"
+      - name: mux-forward
+        port: "{{ openshift_logging_mux_port }}"
+        targetPort: "mux-forward"
     external_ips:
-    - "{{ ansible_eth0.ipv4.address }}"
+      - "{{ ansible_eth0.ipv4.address }}"
   when: openshift_logging_mux_allow_external | bool
 
 - name: Set logging-mux service for internal communication
@@ -164,9 +164,9 @@
     labels:
       logging-infra: 'support'
     ports:
-    - name: mux-forward
-      port: "{{ openshift_logging_mux_port }}"
-      targetPort: "mux-forward"
+      - name: mux-forward
+        port: "{{ openshift_logging_mux_port }}"
+        targetPort: "mux-forward"
   when: not openshift_logging_mux_allow_external | bool
 
 # create Mux DC
@@ -201,7 +201,7 @@
     selector: "{{ openshift_logging_mux_file_buffer_pvc_pv_selector }}"
     storage_class_name: "{{ openshift_logging_mux_file_buffer_pvc_storage_class_name | default('', true) }}"
   when:
-  - openshift_logging_mux_file_buffer_storage_type == "pvc"
+    - openshift_logging_mux_file_buffer_storage_type == "pvc"
 
 - name: Set logging-mux DC
   oc_obj:
@@ -210,7 +210,7 @@
     namespace: "{{ openshift_logging_mux_namespace }}"
     kind: dc
     files:
-    - "{{ tempdir }}/templates/logging-mux-dc.yaml"
+      - "{{ tempdir }}/templates/logging-mux-dc.yaml"
     delete_after: true
 
 - name: Add mux namespaces