Merge pull request #3908 from edx/feanil/update_elasticsearch_role

Update to elasticsearch 1.5

CHANGELOG.md

+- Role: elasticsearch
+  - Replaced `elasticsearch_apt_key` and `elastic_search_apt_keyserver` with `elasticsearch_apt_key_url`
+  - Updated elasticsearch version to 1.5.0
+
 - Role: edxapp
   - Install development.txt in Vagrant and Docker devstacks
 

docker/build/elasticsearch/Dockerfile

-FROM edxops/precise-common:latest
+FROM edxops/xenial-common:latest
 MAINTAINER edxops
 
 ADD . /edx/app/edx_ansible/edx_ansible
@@ -9,5 +9,5 @@ RUN /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook elasticsearch.ym
    -i '127.0.0.1,'
 
 WORKDIR /etc/elasticsearch
-CMD ["/usr/share/elasticsearch/bin/elasticsearch","-f"]
+CMD service elasticsearch start && sleep 5 && tail -f /edx/var/log/elasticsearch/elasticsearch.log
 EXPOSE 9200 9300

playbooks/roles/elasticsearch/defaults/main.yml

@@ -3,9 +3,8 @@ elasticsearch_app_dir: "{{ COMMON_APP_DIR }}/elasticsearch"
 elasticsearch_data_dir: "{{ COMMON_DATA_DIR }}/elasticsearch"
 elasticsearch_log_dir: "{{ COMMON_LOG_DIR }}/elasticsearch"
 elasticsearch_cfg_dir: "{{ COMMON_CFG_DIR }}/elasticsearch"
-elasticsearch_apt_key: "46095ACC8548582C1A2699A9D27D666CD88E42B4"
-elasticsearch_apt_keyserver: "ha.pool.sks-keyservers.net"
-elasticsearch_repo: "deb http://packages.elasticsearch.org/elasticsearch/0.90/debian stable main"
+elasticsearch_apt_key_url: "https://packages.elastic.co/GPG-KEY-elasticsearch"
+elasticsearch_repo: "deb http://packages.elastic.co/elasticsearch/1.5/debian stable main"
 elasticsearch_package_name: "elasticsearch"
 elasticsearch_user: "elasticsearch"
 elasticsearch_group: "elasticsearch"
@@ -14,4 +13,4 @@ elasticsearch_group: "elasticsearch"
 # Defaults for a single server installation.
 ELASTICSEARCH_CLUSTER_MEMBERS: []
 ELASTICSEARCH_HEAP_SIZE: "512m"
-ELASTICSEARCH_VERSION: "0.90.13"
+ELASTICSEARCH_VERSION: "1.5.0"

playbooks/roles/elasticsearch/tasks/main.yml

@@ -31,8 +31,7 @@
 
 - name: Install Elasticsearch repo key 
   apt_key:
-    id: "{{ elasticsearch_apt_key }}"
-    keyserver: "{{ elasticsearch_apt_keyserver }}"
+    url: "{{ elasticsearch_apt_key_url }}"
     state: present
   tags:
     - install