Merge pull request #4364 from jcantrill/bz1457642_set_name_to_dc

Merged by openshift-bot

roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2

@@ -14,6 +14,7 @@ index:
     flush_threshold_period: 5m
 
 node:
+  name: ${DC_NAME}
   master: ${IS_MASTER}
   data: ${HAS_DATA}
   max_local_storage_nodes: 1
@@ -61,7 +62,7 @@ path:
 searchguard:
   authcz.admin_dn:
   - CN=system.admin,OU=OpenShift,O=Logging
-  config_index_name: ".searchguard.${HOSTNAME}"
+  config_index_name: ".searchguard.${DC_NAME}"
   ssl:
     transport:
       enabled: true

roles/openshift_logging_elasticsearch/templates/es.j2

@@ -58,6 +58,9 @@ spec:
               name: "cluster"
           env:
             -
+              name: "DC_NAME"
+              value: "{{deploy_name}}"
+            -
               name: "NAMESPACE"
               valueFrom:
                 fieldRef: