From b0de7b654a6b9dde5110d0eb4cbf601b0e1bdde1 Mon Sep 17 00:00:00 2001 From: Konstantin Papkovskiy Date: Mon, 5 Dec 2016 17:47:52 +0300 Subject: [PATCH 1/3] Remove httplib2 The dependency on httplib2 was removed in Ansible 2.1 --- tasks/elasticsearch-Debian.yml | 4 ---- tasks/elasticsearch-RedHat.yml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml index dbf764a..2060c21 100644 --- a/tasks/elasticsearch-Debian.yml +++ b/tasks/elasticsearch-Debian.yml @@ -37,7 +37,3 @@ apt: deb=/tmp/elasticsearch-{{ es_version }}.deb when: not es_use_repository register: elasticsearch_install_from_package - -# ansible uri module requires httplib2 -- name: python-httplib2 - apt: name=python-httplib2 diff --git a/tasks/elasticsearch-RedHat.yml b/tasks/elasticsearch-RedHat.yml index 8a9be8b..94697b9 100644 --- a/tasks/elasticsearch-RedHat.yml +++ b/tasks/elasticsearch-RedHat.yml @@ -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 when: not es_use_repository register: elasticsearch_install_from_package - -# ansible uri module requires python-httplib2 -- name: python-httplib2 - pip: name=httplib2 \ No newline at end of file From d5d2de6340d12d1afe4f6150c855aa35e62ca1c5 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Mon, 2 Jan 2017 16:19:48 +0000 Subject: [PATCH 2/3] Kitchen changes --- .kitchen.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index 0d2582c..c1f2a2a 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -8,7 +8,7 @@ provisioner: roles_path: ../ require_ansible_repo: true ansible_verbose: true - ansible_version: 2.0.2 + ansible_version: 2.2.0 http_proxy: <%= ENV['HTTP_PROXY'] %> https_proxy: <%= ENV['HTTPS_PROXY'] %> no_proxy: localhost,127.0.0.1 @@ -42,12 +42,6 @@ platforms: - sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config use_sudo: false run_command: "/sbin/init" - - name: centos-6 - driver_config: - image: dliappis/centos-devopsci:6 - privileged: true - provision_command: - use_sudo: false - name: centos-7 driver_config: image: dliappis/centos-devopsci:7 From 5b2b76d1fc2d97e1fd8613e36dc2ed3c7c260b14 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Mon, 2 Jan 2017 19:56:01 +0000 Subject: [PATCH 3/3] restoring centos 6 support --- .kitchen.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.kitchen.yml b/.kitchen.yml index c1f2a2a..af2391f 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -42,6 +42,12 @@ platforms: - sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config use_sudo: false run_command: "/sbin/init" + - name: centos-6 + driver_config: + image: dliappis/centos-devopsci:6 + privileged: true + provision_command: + use_sudo: false - name: centos-7 driver_config: image: dliappis/centos-devopsci:7