From 25e5620fb7a74152064f17b81ab96ace14221338 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Fri, 18 Mar 2016 21:42:32 +0000 Subject: [PATCH] Gemfile spec for ansible kitchen --- .kitchen.yml | 11 +++-------- Gemfile | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index e705f18..4874b31 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -8,9 +8,9 @@ provisioner: roles_path: ../ require_ansible_repo: true ansible_verbose: true - #http_proxy: <%= ENV['HTTP_PROXY'] %> - #https_proxy: <%= ENV['HTTPS_PROXY'] %> - #no_proxy: localhost,127.0.0.1 + http_proxy: <%= ENV['HTTP_PROXY'] %> + https_proxy: <%= ENV['HTTPS_PROXY'] %> + no_proxy: localhost,127.0.0.1 platforms: - name: ubuntu-14.04 @@ -21,7 +21,6 @@ platforms: - apt-get update && apt-get install -y software-properties-common && add-apt-repository -y ppa:ansible/ansible - apt-get update && apt-get -y -q install ansible python-apt python-pycurl use_sudo: false - ansible_platform: ubuntu - name: debian-7 driver_config: image: electrical/debian:7.3 @@ -32,7 +31,6 @@ platforms: - apt-get install -y -q ansible - apt-get install -y -q net-tools use_sudo: false - ansible_platform: debian - name: debian-8 driver_config: image: electrical/debian:8 @@ -46,13 +44,11 @@ platforms: - sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config use_sudo: false run_command: "/sbin/init" - ansible_platform: debian - name: centos-6 driver_config: image: electrical/centos:6.4-1 privileged: true use_sudo: false - ansible_platform: centos - name: centos-7 driver_config: image: electrical/centos:7 @@ -65,7 +61,6 @@ platforms: run_command: "/usr/sbin/init" privileged: true use_sudo: false - ansible_platform: centos suites: - name: standard-2x diff --git a/Gemfile b/Gemfile index cd4bcfb..dc71783 100644 --- a/Gemfile +++ b/Gemfile @@ -2,5 +2,5 @@ source 'https://rubygems.org' gem 'test-kitchen' gem "kitchen-docker", '< 2.2.0' -gem 'kitchen-ansible' +gem 'kitchen-ansible', '0.0.38' gem 'net-ssh', '~> 2.0'