santerikainulainen/ansible-role-elasticsearch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #217 from gingerwizard/master

Browse source 
Ansible test update + 202
This commit is contained in:
Dale McDiarmid 2017-01-02 19:53:50 +00:00 • committed by GitHub
commit d9abf92502
3 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.kitchen.yml
View file

@ -8,7 +8,7 @@ provisioner:
roles_path: ../ roles_path: ../
require_ansible_repo: true require_ansible_repo: true
ansible_verbose: true ansible_verbose: true
ansible_version: 2.0.2 ansible_version: 2.2.0
http_proxy: <%= ENV['HTTP_PROXY'] %> http_proxy: <%= ENV['HTTP_PROXY'] %>
https_proxy: <%= ENV['HTTPS_PROXY'] %> https_proxy: <%= ENV['HTTPS_PROXY'] %>
no_proxy: localhost,127.0.0.1 no_proxy: localhost,127.0.0.1

4
tasks/elasticsearch-Debian.yml
View file

@ -37,7 +37,3 @@
apt: deb=/tmp/elasticsearch-{{ es_version }}.deb apt: deb=/tmp/elasticsearch-{{ es_version }}.deb
when: not es_use_repository when: not es_use_repository
register: elasticsearch_install_from_package register: elasticsearch_install_from_package
# ansible uri module requires httplib2
- name: python-httplib2
apt: name=python-httplib2

4
tasks/elasticsearch-RedHat.yml
View file

@ -23,7 +23,3 @@
yum: name={% if es_custom_package_url is defined %}{{ es_custom_package_url }}{% else %}{{ es_package_url }}-{{ es_version }}.noarch.rpm{% endif %} state=present yum: name={% if es_custom_package_url is defined %}{{ es_custom_package_url }}{% else %}{{ es_package_url }}-{{ es_version }}.noarch.rpm{% endif %} state=present
when: not es_use_repository when: not es_use_repository
register: elasticsearch_install_from_package register: elasticsearch_install_from_package
# ansible uri module requires python-httplib2
- name: python-httplib2
pip: name=httplib2