Merge pull request #4327 from ewolinetz/fix_logging_secret

Merged by openshift-bot

roles/openshift_logging/tasks/delete_logging.yaml

@@ -32,9 +32,8 @@
 
 # delete our old secrets
 - name: delete logging secrets
-  oc_obj:
+  oc_secret:
     state: absent
-    kind: secret
     namespace: "{{ openshift_logging_namespace }}"
     name: "{{ item }}"
   with_items:

roles/openshift_logging/tasks/install_logging.yaml

@@ -10,7 +10,7 @@
     name: "{{ openshift_logging_namespace }}"
     node_selector: "{{ openshift_logging_nodeselector | default(null) }}"
 
-- name: Labelling logging project
+- name: Labeling logging project
   oc_label:
     state: present
     kind: namespace
@@ -23,7 +23,7 @@
   - openshift_logging_labels is defined
   - openshift_logging_labels is dict
 
-- name: Labelling logging project
+- name: Labeling logging project
   oc_label:
     state: present
     kind: namespace
@@ -78,6 +78,8 @@
   - "{{ openshift_logging_facts.elasticsearch.deploymentconfigs }}"
   - "{{ openshift_logging_facts.elasticsearch.pvcs }}"
   - "{{ es_indices }}"
+  when:
+  - openshift_logging_facts.elasticsearch.deploymentconfigs.keys() | count > 0
 
 # Create any new DC that may be required
 - include_role:
@@ -124,6 +126,7 @@
   - "{{ es_ops_indices }}"
   when:
   - openshift_logging_use_ops | bool
+  - openshift_logging_facts.elasticsearch_ops.deploymentconfigs.keys() | count > 0
 
 # Create any new DC that may be required
 - include_role:

roles/openshift_logging_kibana/tasks/main.yaml

@@ -179,7 +179,7 @@
     #  path: "{{ generated_certs_dir }}/kibana-internal.key"
     #- name: server-cert
     #  path: "{{ generated_certs_dir }}/kibana-internal.crt"
-    #- name: server-tls
+    #- name: server-tls.json
     #  path: "{{ generated_certs_dir }}/server-tls.json"
     contents:
     - path: oauth-secret
@@ -190,7 +190,7 @@
       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
+    - path: server-tls.json
       data: "{{ key_pairs | entry_from_named_pair('server_tls') | b64decode }}"
 
 # create Kibana DC