diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-05-31 10:56:15 -0500 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-05-31 10:56:15 -0500 |
| commit | 0d904fdb0c6682245fc0a269e9431172b35e10f5 (patch) | |
| tree | e231a3b1b840415db25814d92e9dffa9ed4ea64a /roles/openshift_logging | |
| parent | 15221b6943df7e54ff00db6271ee89eb5cbe0425 (diff) | |
| download | openshift-0d904fdb0c6682245fc0a269e9431172b35e10f5.tar.gz openshift-0d904fdb0c6682245fc0a269e9431172b35e10f5.tar.bz2 openshift-0d904fdb0c6682245fc0a269e9431172b35e10f5.tar.xz openshift-0d904fdb0c6682245fc0a269e9431172b35e10f5.zip | |
Updating Kibana-proxy secret key name, fixing deleting secrets, fixed extra ES dc creation
Diffstat (limited to 'roles/openshift_logging')
| -rw-r--r-- | roles/openshift_logging/tasks/delete_logging.yaml | 3 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/roles/openshift_logging/tasks/delete_logging.yaml b/roles/openshift_logging/tasks/delete_logging.yaml index 0c7152b16..6d023a02d 100644 --- a/roles/openshift_logging/tasks/delete_logging.yaml +++ b/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: diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index 551638781..3535b2804 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/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: |