diff options
| author | Jeff Cantrill <jcantril@redhat.com> | 2017-03-24 14:42:06 -0400 |
|---|---|---|
| committer | Jeff Cantrill <jcantril@redhat.com> | 2017-03-28 08:50:07 -0400 |
| commit | 9fcef0ea18469f3e12c6f9ca6f3f8c89a420d568 (patch) | |
| tree | 9411e6e611c818637f4d35342fe4619370f025d5 | |
| parent | 0d38f04595fc2098cf8304faf20e15e62f43955c (diff) | |
| download | openshift-9fcef0ea18469f3e12c6f9ca6f3f8c89a420d568.tar.gz openshift-9fcef0ea18469f3e12c6f9ca6f3f8c89a420d568.tar.bz2 openshift-9fcef0ea18469f3e12c6f9ca6f3f8c89a420d568.tar.xz openshift-9fcef0ea18469f3e12c6f9ca6f3f8c89a420d568.zip | |
fix es config merge so template does not need quoting. gen then merge
| -rw-r--r-- | roles/openshift_logging/tasks/generate_configmaps.yaml | 16 | ||||
| -rw-r--r-- | roles/openshift_logging/templates/elasticsearch.yml.j2 | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/roles/openshift_logging/tasks/generate_configmaps.yaml b/roles/openshift_logging/tasks/generate_configmaps.yaml index c1721895c..18df00647 100644 --- a/roles/openshift_logging/tasks/generate_configmaps.yaml +++ b/roles/openshift_logging/tasks/generate_configmaps.yaml @@ -7,20 +7,20 @@ changed_when: no - local_action: > - copy content="{{ config_source | combine(override_config,recursive=True) | to_nice_yaml }}" + template src=elasticsearch.yml.j2 dest="{{local_tmp.stdout}}/elasticsearch-gen-template.yml" vars: - config_source: "{{lookup('file','templates/elasticsearch.yml.j2') | from_yaml }}" - override_config: "{{openshift_logging_es_config | from_yaml}}" - when: es_logging_contents is undefined + - allow_cluster_reader: "{{openshift_logging_es_ops_allow_cluster_reader | lower | default('false')}}" + when: es_config_contents is undefined changed_when: no - - template: - src: "{{local_tmp.stdout}}/elasticsearch-gen-template.yml" + - copy: + content: "{{ config_source | combine(override_config,recursive=True) | to_nice_yaml }}" dest: "{{mktemp.stdout}}/elasticsearch.yml" vars: - - allow_cluster_reader: "{{openshift_logging_es_ops_allow_cluster_reader | lower | default('false')}}" - when: es_config_contents is undefined + config_source: "{{lookup('file','{{local_tmp.stdout}}/elasticsearch-gen-template.yml') | from_yaml }}" + override_config: "{{openshift_logging_es_config | from_yaml}}" + when: es_logging_contents is undefined changed_when: no - copy: diff --git a/roles/openshift_logging/templates/elasticsearch.yml.j2 b/roles/openshift_logging/templates/elasticsearch.yml.j2 index 07e8c0c98..93c4d854c 100644 --- a/roles/openshift_logging/templates/elasticsearch.yml.j2 +++ b/roles/openshift_logging/templates/elasticsearch.yml.j2 @@ -49,7 +49,7 @@ openshift.searchguard: keystore.path: /etc/elasticsearch/secret/admin.jks truststore.path: /etc/elasticsearch/secret/searchguard.truststore -openshift.operations.allow_cluster_reader: "{{allow_cluster_reader | default (false)}}" +openshift.operations.allow_cluster_reader: {{allow_cluster_reader | default (false)}} path: data: /elasticsearch/persistent/${CLUSTER_NAME}/data |