diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-06 12:56:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-06 12:56:13 -0400 |
| commit | 67da7e2e4699f9a226a436218723749ebc14ace1 (patch) | |
| tree | 2e7c1b03cf29d4418305bfc776b9a77c03865d9c /roles | |
| parent | 07aa3e0fb2e8eb822ad67c2e24e81a8e028280ff (diff) | |
| parent | 0d904fdb0c6682245fc0a269e9431172b35e10f5 (diff) | |
| download | openshift-67da7e2e4699f9a226a436218723749ebc14ace1.tar.gz openshift-67da7e2e4699f9a226a436218723749ebc14ace1.tar.bz2 openshift-67da7e2e4699f9a226a436218723749ebc14ace1.tar.xz openshift-67da7e2e4699f9a226a436218723749ebc14ace1.zip | |
Merge pull request #4327 from ewolinetz/fix_logging_secret
Merged by openshift-bot
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_logging/tasks/delete_logging.yaml | 3 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 7 | ||||
| -rw-r--r-- | roles/openshift_logging_kibana/tasks/main.yaml | 4 |
3 files changed, 8 insertions, 6 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 dde76b142..7c1062b77 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: diff --git a/roles/openshift_logging_kibana/tasks/main.yaml b/roles/openshift_logging_kibana/tasks/main.yaml index 55b28ee24..d13255386 100644 --- a/roles/openshift_logging_kibana/tasks/main.yaml +++ b/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 |