kitchen-ansible 0.53.0 → 0.54.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 621c646a7a42d16e3401ec6f19f81db5c6fb80833364f00ffbc5513458eea3e8
-  data.tar.gz: 2ffc7fc71b039fa565859c199d16b52d3f7a786049cb4032b9ac43a6405b3f0c
+  metadata.gz: 14915690b90c67925cde829c63de6b9198162986fc2637283f075ea7b37dc4c0
+  data.tar.gz: 86eca88881b0d5c2deb47a877576cc00ccf22e7cbf03cbd67782886bda64b54f
 SHA512:
-  metadata.gz: f66c6917ac9dcf3629c9ed5d1498810806e7f8899d984f5b62def95bef9caa3617d81e3fe42f05f7af8f811c06f0e9b3fc576600476660390bf324f4aedd3fe6
-  data.tar.gz: 325f1fd0213b1f6525afed073eed515fb0ab38b5b4e8fac23af931892f590f32fbafb6d98302cb6382c3bba3a92cd45cc8cc4a1977be6e945adfd3a7be506050
+  metadata.gz: 5952847769f6d7bca3b015d6b9853d29726d1a47d0d24390ffd1ab52ac1cb663efd9abd97bdb2c0f7863683ea7c30287e80804a7f5cdf9dc770cf838330a34b6
+  data.tar.gz: d9c508902611e6716e14e07813dd9ed1057db8d2e09306134d1d39afd06bd574461e82fef3afb20b2d5b2b807dee33182e7f8dff1fa830a00f730905c40e1ab8

data/lib/kitchen-ansible/version.rb

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

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

@@ -28,10 +28,18 @@ module Kitchen
             if [ ! $(which ansible) ]; then
               #{install_epel_repo}
               #{sudo_env('yum-config-manager')} --enable epel/x86_64
-              #{sudo_env('yum')} -y install #{ansible_package_name} git
-              #{sudo_env('alternatives')} --set python /usr/bin/python2.6
-              #{sudo_env('yum')} clean all
-              #{sudo_env('yum')} install yum-python26 -y
+              #{sudo_env('yum')} -y install git
+
+              if `grep -q "Amazon Linux AMI" /etc/os-release`; then
+                ## Amazon Linux 1
+                #{sudo_env('yum')} -y install #{ansible_package_name}
+                #{sudo_env('alternatives')} --set python /usr/bin/python2.6
+                #{sudo_env('yum')} clean all
+                #{sudo_env('yum')} install yum-python26 -y
+              else
+                ## Amazon Linux 2
+                #{sudo_env('amazon-linux-extras')} install -y ansible2
+              fi
             fi
             INSTALL
           end

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

@@ -63,7 +63,11 @@ module Kitchen
                 ## 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]}
+                ## There is no official Ubuntu 20.04 ansible release in the ppa, but Ubuntu has a package with the latest 2.9 Ansible
+                ## This "fixes" issue #321 for now
+                if ! `grep -q 'VERSION_ID=\"20.04\"' /etc/os-release`; then
+                  #{sudo_env('add-apt-repository')} -y #{@config[:ansible_apt_repo]} || #{sudo_env('add-apt-repository')} #{@config[:ansible_apt_repo]}
+                fi
               fi
               #{sudo_env('apt-get')} update
               #{sudo_env('apt-get')} -y install ansible#{ansible_debian_version}

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -90,7 +90,7 @@ module Kitchen
             if [ ! $(which ansible) ]; then
               if [ -f /etc/fedora-release ]; then
                 #{Kitchen::Provisioner::Ansible::Os::Fedora.new('fedora', config).install_command}
-              elif [ -f /etc/system-release ] && [ `grep -q 'Amazon Linux' /etc/system-release` ]; then
+              elif [ -f /etc/system-release ] && `grep -q 'Amazon Linux' /etc/system-release`; then
                 #{Kitchen::Provisioner::Ansible::Os::Amazon.new('amazon', config).install_command}
               elif [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
                 #{Kitchen::Provisioner::Ansible::Os::Redhat.new('redhat', config).install_command}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.54.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-26 00:00:00.000000000 Z
+date: 2020-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec