Merge pull request #8125 from jcantrill/1568361_persistent_logs

bug 1568361. Modify persistent directory for logs

roles/openshift_logging_elasticsearch/templates/2.x/elasticsearch.yml.j2

@@ -58,7 +58,7 @@ openshift.kibana.index.mode: {{es_kibana_index_mode | default('unique')}}
 
 path:
   data: /elasticsearch/persistent/${CLUSTER_NAME}/data
-  logs: /elasticsearch/${CLUSTER_NAME}/logs
+  logs: /elasticsearch/persistent/${CLUSTER_NAME}/logs
   work: /elasticsearch/${CLUSTER_NAME}/work
   scripts: /elasticsearch/${CLUSTER_NAME}/scripts
 

roles/openshift_logging_elasticsearch/templates/5.x/elasticsearch.yml.j2

@@ -47,7 +47,7 @@ openshift.kibana.index.mode: {{es_kibana_index_mode | default('unique')}}
 
 path:
   data: /elasticsearch/persistent/${CLUSTER_NAME}/data
-  logs: /elasticsearch/${CLUSTER_NAME}/logs
+  logs: /elasticsearch/persistent/${CLUSTER_NAME}/logs
 
 searchguard:
   authcz.admin_dn: