Merge pull request #5894 from ewolinetz/logging_defaults_from_existing

Automatic merge from submit-queue.

Update logging to use existing cluster deployment for defaults

This will allow us to use logging facts to set defaults of specific configurations such as ES index replicas and shard count.

The update to logging facts yields us output like: 
```json
"elasticsearch": {
            "clusterrolebindings": {}, 
            "configmaps": {
                "logging-elasticsearch": {
                    "elasticsearch.yml": {
                        "cloud": {
                            "kubernetes": {
                                "namespace": "${NAMESPACE}", 
                                "pod_label": "${POD_LABEL}", 
                                "pod_port": 9300
                            }
                        }, 
                        "cluster": {
                            "name": "${CLUSTER_NAME}"
                        }, 
                        "discovery": {
                            "type": "kubernetes", 
                            "zen.minimum_master_nodes": "${NODE_QUORUM}", 
                            "zen.ping.multicast.enabled": false
                        }, 
                        "gateway": {
                            "expected_nodes": "${RECOVER_EXPECTED_NODES}", 
                            "recover_after_nodes": "${NODE_QUORUM}", 
                            "recover_after_time": "${RECOVER_AFTER_TIME}"
                        }, 
                        "index": {
                            "number_of_replicas": 0, 
                            "number_of_shards": 1, 
                            "translog": {
                                "flush_threshold_period": "5m", 
                                "flush_threshold_size": "256mb"
                            }, 
                            "unassigned.node_left.delayed_timeout": "2m"
                        }, 
                        "io.fabric8.elasticsearch.authentication.users": [
                            "system.logging.kibana", 
                            "system.logging.fluentd", 
                            "system.logging.curator", 
                            "system.admin"
                        ], 
```

TODO:
- [x] Update logging facts to pull out settings from config maps
- [x] Move `openshift_sanitize_inventory/library/conditional_set_fact.py` up to repo level
- [x] Generate diffs against currently deployed configs and correctly patch in custom changes from customers
- [x] Use `conditional_set_fact` to easily set defaults for logging based on logging facts, or falling back to role defaults when not specified in the inventory
- [x] Update all components to follow patching configmaps

1 files changed, 11 insertions, 13 deletions

diff --git a/roles/openshift_logging_mux/tasks/main.yaml b/roles/openshift_logging_mux/tasks/main.yaml
index 59a6301d7..a281c6a53 100644
--- a/roles/openshift_logging_mux/tasks/main.yaml
+++ b/roles/openshift_logging_mux/tasks/main.yaml
@@ -88,26 +88,24 @@
 - copy:
     src: fluent.conf
     dest: "{{mktemp.stdout}}/fluent-mux.conf"
-  when: fluentd_mux_config_contents is undefined
   changed_when: no
 
 - copy:
     src: secure-forward.conf
     dest: "{{mktemp.stdout}}/secure-forward-mux.conf"
-  when: fluentd_mux_securefoward_contents is undefined
   changed_when: no
 
-- copy:
-    content: "{{fluentd_mux_config_contents}}"
-    dest: "{{mktemp.stdout}}/fluent-mux.conf"
-  when: fluentd_mux_config_contents is defined
-  changed_when: no
-
-- copy:
-    content: "{{fluentd_mux_secureforward_contents}}"
-    dest: "{{mktemp.stdout}}/secure-forward-mux.conf"
-  when: fluentd_mux_secureforward_contents is defined
-  changed_when: no
+- include_role:
+    name: openshift_logging
+    tasks_from: patch_configmap_files.yaml
+  vars:
+    configmap_name: "logging-mux"
+    configmap_namespace: "{{ openshift_logging_mux_namespace }}"
+    configmap_file_names:
+      - current_file: "fluent.conf"
+        new_file: "{{ tempdir }}/fluent-mux.conf"
+      - current_file: "secure-forward.conf"
+        new_file: "{{ tempdir }}/secure-forward-mux.conf"
 
 - name: Set Mux configmap
   oc_configmap: