Merged changes from 138

This commit is contained in:
Dale McDiarmid 2016-08-30 12:30:54 +01:00
parent 3c7fbbe3e0
commit 7a2f0b43d2
4 changed files with 9 additions and 9 deletions

View file

@ -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 - include versionlock