kitchen-ansible 0.46.3 → 0.46.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ff6c857b37974cb25f27ac23756bff7f69e8c0f
-  data.tar.gz: 3f5458a86db9f1662dc996be3e1951ba250e0b29
+  metadata.gz: 87e37287168010d760b9011c4563626769900a6d
+  data.tar.gz: 1b0903cf20c7f7b9178a4c6452351cb3da8e3dcf
 SHA512:
-  metadata.gz: c3886fdab9de7d81ec0263e5cc8fe421208907fcd5f5f74d375b076645ee774e49921e85d2179a119d13a8260e9cec63d968831d842f13dd589fcdbe9b49e93a
-  data.tar.gz: 557df5fea59f9191593cbe76f02162ea3f50c7090eaf75c4a0021440c31c8a011d7735f24330b6e16086e2fbb9a928498ee9be01343ba152afb79b5f4745c4c7
+  metadata.gz: a5a9c542115bfe96333bf757d01058cc97226c417d9e95bcf7f938758745381a7a21656ea5944cbbee42b7f29983357a7e04fa59f5def135262d6a49e11bfbf7
+  data.tar.gz: 94238d5b1cbe84153890fe692457e81e5a2de50e47f59e42512f15edd7bd0dad078e257d963c921da216a1b66401c86ee01e4e17f45ce5db897b8ad5123e284a

data/lib/kitchen-ansible/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 module Kitchen
   module Ansible
-    VERSION = '0.46.3'.freeze
+    VERSION = '0.46.4'.freeze
   end
 end

data/lib/kitchen/provisioner/ansible/os/debian.rb

@@ -46,17 +46,22 @@ module Kitchen
               ## Fix debconf tty warning messages
               export DEBIAN_FRONTEND=noninteractive
 
-              ## 13.10, 14.04 include add-apt-repository in software-properties-common
-              #{sudo_env('apt-get')} -y install software-properties-common
+              if [ -f /etc/os-release ] && [ `grep 'ID=debian' /etc/os-release` ]; then
+                #{sudo_env('echo')} "deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main" | sudo tee -a /etc/apt/sources.list
+                #{sudo_env('apt-key')} adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367
+              else
+                ## 13.10, 14.04 include add-apt-repository in software-properties-common
+                #{sudo_env('apt-get')} -y install software-properties-common
 
-              ## 10.04, 12.04 include add-apt-repository in
-              #{sudo_env('apt-get')} -y install python-software-properties
+                ## 10.04, 12.04 include add-apt-repository in
+                #{sudo_env('apt-get')} -y install python-software-properties
 
-              ## 10.04 version of add-apt-repository doesn't accept --yes
-              ## later versions require interaction from user, so we must specify --yes
-              ## First try with -y flag, else if it fails, try without.
-              ## "add-apt-repository: error: no such option: -y" is returned but is ok to ignore, we just retry
-              #{sudo_env('add-apt-repository')} -y #{@config[:ansible_apt_repo]} || #{sudo_env('add-apt-repository')} #{@config[:ansible_apt_repo]}
+                ## 10.04 version of add-apt-repository doesn't accept --yes
+                ## later versions require interaction from user, so we must specify --yes
+                ## First try with -y flag, else if it fails, try without.
+                ## "add-apt-repository: error: no such option: -y" is returned but is ok to ignore, we just retry
+                #{sudo_env('add-apt-repository')} -y #{@config[:ansible_apt_repo]} || #{sudo_env('add-apt-repository')} #{@config[:ansible_apt_repo]}
+              fi
               #{sudo_env('apt-get')} update
               #{sudo_env('apt-get')} -y install ansible#{ansible_debian_version}
             fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.46.3
+  version: 0.46.4
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen