Closes #9: If only major version is defined, install the latest minor version

This commit is contained in:
Jakob Reiter 2015-07-07 11:28:46 +02:00
parent 2f3f84b6f3
commit 687d8e33ca
2 changed files with 12 additions and 2 deletions

View file

@ -3,8 +3,13 @@
apt_key: url="http://packages.elasticsearch.org/GPG-KEY-elasticsearch" state=present apt_key: url="http://packages.elasticsearch.org/GPG-KEY-elasticsearch" state=present
- name: Debian - add elasticsearch repository - 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="deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main" state=present
- name: Debian - Ensure elasticsearch is installed. - name: Debian - Ensure elasticsearch is installed with minor version supplied.
apt: name=elasticsearch={{ es_version }} state=present cache_valid_time=86400 apt: name=elasticsearch={{ es_version }} state=present cache_valid_time=86400
when: es_version != ""
register: elasticsearch_install
- name: Debian - Ensure elasticsearch is installed without minor version supplied.
apt: name=elasticsearch state=present cache_valid_time=86400
when: es_version == ""
register: elasticsearch_install register: elasticsearch_install
- name: Debian - configure memory - name: Debian - configure memory

View file

@ -4,9 +4,14 @@
when: ( ansible_distribution == "CentOS" ) and ( ansible_distribution_major_version == "6" ) when: ( ansible_distribution == "CentOS" ) and ( ansible_distribution_major_version == "6" )
- name: RedHat - add Elasticsearch repo - name: RedHat - add Elasticsearch repo
template: src=elasticsearch.repo dest=/etc/yum.repos.d/elasticsearch-{{ es_major_version }}.repo template: src=elasticsearch.repo dest=/etc/yum.repos.d/elasticsearch-{{ es_major_version }}.repo
- name: RedHat - Install Elasticsearch - name: RedHat - Install Elasticsearch with minor version supplied
when: es_version != ""
yum: name=elasticsearch-{{ es_version }} state=present update_cache=yes yum: name=elasticsearch-{{ es_version }} state=present update_cache=yes
register: elasticsearch_install register: elasticsearch_install
- name: RedHat - Install Elasticsearch without minor version supplied
when: es_version == ""
yum: name=elasticsearch state=present update_cache=yes
register: elasticsearch_install
- name: RedHat - configure memory - name: RedHat - configure memory
lineinfile: dest=/etc/sysconfig/elasticsearch regexp="^ES_HEAP_SIZE" insertafter="^#ES_HEAP_SIZE" line="ES_HEAP_SIZE={{ es_heap_size }}" lineinfile: dest=/etc/sysconfig/elasticsearch regexp="^ES_HEAP_SIZE" insertafter="^#ES_HEAP_SIZE" line="ES_HEAP_SIZE={{ es_heap_size }}"