From 2d9eeac5a20523e3574044bfbede1f0c0686c159 Mon Sep 17 00:00:00 2001
From: Jeff Cantrill <jcantril@redhat.com>
Date: Fri, 2 Jun 2017 16:20:28 -0400
Subject: bug 1457642. Use same SG index to avoid seeding timeout

---
 roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2 | 3 ++-
 roles/openshift_logging_elasticsearch/templates/es.j2                | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'roles/openshift_logging_elasticsearch')

diff --git a/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2 b/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2
index 58c325c8a..690b5c097 100644
--- a/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2
+++ b/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}
 
@@ -60,7 +61,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
diff --git a/roles/openshift_logging_elasticsearch/templates/es.j2 b/roles/openshift_logging_elasticsearch/templates/es.j2
index bd2289f0d..844dbc8c2 100644
--- a/roles/openshift_logging_elasticsearch/templates/es.j2
+++ b/roles/openshift_logging_elasticsearch/templates/es.j2
@@ -57,6 +57,9 @@ spec:
               containerPort: 9300
               name: "cluster"
           env:
+            -
+              name: "DC_NAME"
+              value: "{{deploy_name}}"
             -
               name: "NAMESPACE"
               valueFrom:
-- 
cgit v1.2.1