Browse Source

additional comments addressed

ewolinetz 8 years ago
parent
commit
9cf70bb699

+ 4 - 9
roles/openshift_logging/tasks/generate_configmaps.yaml

@@ -6,16 +6,11 @@
       when: es_logging_contents is undefined
       changed_when: no
 
-    - copy:
-        src: elasticsearch.yml
-        dest: "{{mktemp.stdout}}/elasticsearch.yml"
-      when: es_config_contents is undefined
-      changed_when: no
-
-    - lineinfile:
+    - template:
+        src: elasticsearch.yml.j2
         dest: "{{mktemp.stdout}}/elasticsearch.yml"
-        regexp: '^openshift\.operations\.allow_cluster_reader(.)*$'
-        line: "\nopenshift.operations.allow_cluster_reader: {{openshift_logging_es_ops_allow_cluster_reader | lower}}"
+      vars:
+        - allow_cluster_reader: "{{openshift_logging_es_ops_allow_cluster_reader | lower | default('false')}}"
       when: es_config_contents is undefined
       changed_when: no
 

+ 1 - 0
roles/openshift_logging/files/elasticsearch.yml

@@ -42,6 +42,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')}}
 
 path:
   data: /elasticsearch/persistent/${CLUSTER_NAME}/data