diff options
| author | Jeff Cantrill <jcantril@redhat.com> | 2017-06-02 16:20:28 -0400 |
|---|---|---|
| committer | Jeff Cantrill <jcantril@redhat.com> | 2017-06-14 07:57:49 -0400 |
| commit | 2d9eeac5a20523e3574044bfbede1f0c0686c159 (patch) | |
| tree | 4365400a0e1ca87fa7d8e27b1cb8b1f8034a46a7 | |
| parent | 87f505afd874b84e9ac239adc04be809d72cc5fd (diff) | |
| download | openshift-2d9eeac5a20523e3574044bfbede1f0c0686c159.tar.gz openshift-2d9eeac5a20523e3574044bfbede1f0c0686c159.tar.bz2 openshift-2d9eeac5a20523e3574044bfbede1f0c0686c159.tar.xz openshift-2d9eeac5a20523e3574044bfbede1f0c0686c159.zip | |
bug 1457642. Use same SG index to avoid seeding timeout
| -rw-r--r-- | roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2 | 3 | ||||
| -rw-r--r-- | roles/openshift_logging_elasticsearch/templates/es.j2 | 3 |
2 files changed, 5 insertions, 1 deletions
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 @@ -58,6 +58,9 @@ spec: name: "cluster" env: - + name: "DC_NAME" + value: "{{deploy_name}}" + - name: "NAMESPACE" valueFrom: fieldRef: |