diff --git a/defaults/main.yml b/defaults/main.yml index 451000f..edc1556 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,6 +3,8 @@ es_major_version: "2.x" es_version: "2.2.0" es_version_lock: false es_use_repository: true +es_apt_key: "http://packages.elasticsearch.org/GPG-KEY-elasticsearch" +es_apt_url: "deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main" es_start_service: true es_java_install: true update_java: false diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml index dba5fa5..bde925a 100644 --- a/tasks/elasticsearch-Debian.yml +++ b/tasks/elasticsearch-Debian.yml @@ -6,11 +6,11 @@ when: es_allow_downgrades - name: Debian - Add Elasticsearch repository key - apt_key: url="http://packages.elasticsearch.org/GPG-KEY-elasticsearch" state=present - when: es_use_repository + apt_key: url="{{ es_apt_key }}" state=present + when: es_use_repository and es_apt_key - name: Debian - add elasticsearch repository - apt_repository: repo="deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main" state=present + apt_repository: repo="{{ es_apt_url }}" state=present when: es_use_repository - name: Debian - Ensure elasticsearch is installed