diff --git a/CHANGELOG.md b/CHANGELOG.md index 66f734f5..e664b7f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The **patch** part changes incrementally at each release. ### Added * elasticsearch: tmpdir configuration compatible with 5.x also +* elasticsearch: add http.publish_host variable ### Changed diff --git a/elasticsearch/README.md b/elasticsearch/README.md index 9f968ae2..8db3e31a 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -17,7 +17,8 @@ Tasks are extracted in several files, included in `tasks/main.yml` : * `elasticsearch_cluster_name`: cluster name ; * `elasticsearch_node_name`: node name, defaults to hostname ; * `elasticsearch_network_host`: which interfaces to bind to ; -* `elasticsearch_network_publish_host`: which interface to publish ; +* `elasticsearch_network_publish_host`: which interface to publish for node-to-node communication (default: `Null`) ; +* `elasticsearch_http_publish_host`: which interface to publish for clients (default: `Null`) ; * `elasticsearch_custom_datadir`: custom datadir ; * `elasticsearch_custom_tmpdir`: custom tmpdir ; * `elasticsearch_jvm_xms`: mininum heap size reserved for the JVM (default: `2g`). diff --git a/elasticsearch/defaults/main.yml b/elasticsearch/defaults/main.yml index 8b5dd20e..3d549462 100644 --- a/elasticsearch/defaults/main.yml +++ b/elasticsearch/defaults/main.yml @@ -4,7 +4,8 @@ elastic_stack_version: "6.x" elasticsearch_cluster_name: Null elasticsearch_node_name: "${HOSTNAME}" elasticsearch_network_host: "[_site_, _local_]" -elasticsearch_network_publish_host: "_site_" +elasticsearch_network_publish_host: Null +elasticsearch_http_publish_host: Null elasticsearch_custom_datadir: Null elasticsearch_custom_tmpdir: Null elasticsearch_default_tmpdir: /var/lib/elasticsearch/tmp diff --git a/elasticsearch/tasks/configuration.yml b/elasticsearch/tasks/configuration.yml index b9fecd47..9ea00955 100644 --- a/elasticsearch/tasks/configuration.yml +++ b/elasticsearch/tasks/configuration.yml @@ -39,6 +39,16 @@ tags: - config +- name: Configure http publish_host + lineinfile: + dest: /etc/elasticsearch/elasticsearch.yml + line: "http.publish_host: {{ elasticsearch_http_publish_host }}" + regexp: "^http.publish_host:" + insertafter: "^http.port:" + when: elasticsearch_http_publish_host|default("", True) + tags: + - config + - name: Configure RESTART_ON_UPGRADE lineinfile: dest: /etc/default/elasticsearch