diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-21 22:24:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 22:24:35 -0400 |
| commit | 84012fbbe8ad4b71c717803cd72178f8faecef1d (patch) | |
| tree | 5f813f98cd15deaa2c22f22b6dd5d9a392701ade | |
| parent | 96756fe208172490a4b6af7a5f796fa354e7e51f (diff) | |
| parent | 2d9eeac5a20523e3574044bfbede1f0c0686c159 (diff) | |
| download | openshift-84012fbbe8ad4b71c717803cd72178f8faecef1d.tar.gz openshift-84012fbbe8ad4b71c717803cd72178f8faecef1d.tar.bz2 openshift-84012fbbe8ad4b71c717803cd72178f8faecef1d.tar.xz openshift-84012fbbe8ad4b71c717803cd72178f8faecef1d.zip | |
Merge pull request #4364 from jcantrill/bz1457642_set_name_to_dc
Merged by openshift-bot
| -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 409e564c2..141967c33 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} 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 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: |