kitchen-ansible 0.55.0 → 0.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b1b9ed5296c5ccc0a6c0de5ed5dffda713e3cdfd36c835d6911591a89d92c40
-  data.tar.gz: 39ee501a044573823c5b1bf321d15d81ce9a557446ff664c917216f54723b21f
+  metadata.gz: bb3c0e10d572c5db59b9d6ecc8be05c0b62f227beb977f68b8c8b6b5e261a5f4
+  data.tar.gz: d33c5a241fab596f8dd4f849a2b5784eaac33d04ae3711a8cd8d1ff068ee9151
 SHA512:
-  metadata.gz: 5c51f85d84585dbb8c888be34d11b877ec954de08230816767ac9754360798655b4a69f3414aebc6f415ed034dc21715ac35364ee1c0f74ad2a30343a90ab982
-  data.tar.gz: beecbbc16b179865e4e7123860462101857151105f8697821618f8feb21406ff241fe9dd61b4e737d64d4d4d6af7cb0471804ec0ef81eb5fdd2986df7ce8ecce
+  metadata.gz: 3981c30637f136f8441b6644b0845a63e8cd6d8e7e9194079712525e38f7b905e14a47d52e191bebcc378c8574b1d1a38428a9d7ce4e7435affaeacfa0d70dab
+  data.tar.gz: 701f3281bdf9c5d6fc1346f0523221efc36e911385bd0cbe6657b38d7544f0fbf6e4ae928f726bf06e4fea1ffaeb6bf060e4943d2c45220b6c8f750b94598d20

data/lib/kitchen-ansible/version.rb

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

data/lib/kitchen/provisioner/ansible/config.rb

@@ -44,8 +44,8 @@ module Kitchen
         default_config :tags, []
         default_config :ansible_apt_repo, 'ppa:ansible/ansible'
         default_config :ansible_yum_repo, nil
-        default_config :ansible_sles_repo, 'http://download.opensuse.org/repositories/systemsmanagement/SLE_12/systemsmanagement.repo'
-        default_config :python_sles_repo, 'http://download.opensuse.org/repositories/devel:/languages:/python/SLE_12/devel:languages:python.repo'
+        default_config :ansible_sles_repo, 'http://download.opensuse.org/repositories/systemsmanagement/openSUSE_Leap_15.2/systemsmanagement.repo'
+        default_config :python_sles_repo, 'http://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_Leap_15.2/devel:languages:python.repo'
         default_config :chef_bootstrap_url, 'https://www.chef.io/chef/install.sh'
         # Providing we have Ruby >= 2.0 we only need Ruby. Leaving default to install Chef Omnibus for backwards compatibility.
         # Note: if using kitchen-verifer-serverspec your we can avoid needing Ruby too.

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -543,9 +543,13 @@ module Kitchen
           <<-INSTALL
             if [ ! $(which ansible) ]; then
               if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
+                EL_RELEASE=$(rpm -E %{rhel})
+                if [ "${EL_RELEASE}" -ge 8 ]; then
+                  echo "*** Redhat/Centos 8 does not support pip2 with kitchen-ansible ***"
+                fi
                 #{Kitchen::Provisioner::Ansible::Os::Redhat.new('redhat', config).install_epel_repo}
                 #{update_packages_redhat_cmd} > #{detect_debug}
-                #{sudo_env('yum')} -y install libselinux-python python2-devel git python-setuptools python-setuptools-dev libffi-devel openssl-devel gcc > #{detect_debug}
+                #{sudo_env('yum')} -y install libselinux-python python2-devel git python-setuptools libffi-devel openssl-devel gcc > #{detect_debug}
               else
                 if [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ]; then
                   #{sudo_env('zypper')} ar #{python_sles_repo} > #{detect_debug}
@@ -558,7 +562,8 @@ module Kitchen
               fi
 
             #{export_http_proxy}
-            #{sudo_env('easy_install')} pip > #{detect_debug}
+            #{sudo_env('curl')} 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' -o 'get-pip.py' > #{detect_debug}
+	    #{sudo_env('python')} 'get-pip.py' > #{detect_debug}
             #{sudo_env('pip')} install -U setuptools > #{detect_debug}
             #{sudo_env('pip')} install ansible#{ansible_version} > #{detect_debug}
           fi
@@ -581,14 +586,15 @@ module Kitchen
                       if [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ]; then
                         #{sudo_env('zypper')} ar #{python_sles_repo} > #{detect_debug}
                         #{update_packages_suse_cmd} > #{detect_debug}
-                        #{sudo_env('zypper')} --non-interactive install python python-devel git python-setuptools python-pip python-six libyaml-devel libffi-devel libopenssl-devel > #{detect_debug}
+                        #{sudo_env('zypper')} --non-interactive install python3 python3-pip  python3-setuptools python-devel git python-six libyaml-devel libffi-devel libopenssl-devel > #{detect_debug}
                       else
                         #{update_packages_debian_cmd} > #{detect_debug}
-                        #{sudo_env('apt-get')} -y install git python python-pip python-setuptools build-essential python-dev libffi-dev libssl-dev > #{detect_debug}
+                        #{sudo_env('apt-get')} -y install git python3 python3-pip python3-setuptools build-essential python3-dev libffi-dev libssl-dev > #{detect_debug}
                       fi
                     fi
 
                   #{export_http_proxy}
+                  #{sudo_env('python3')} -m pip install --upgrade pip > #{detect_debug}
                   #{sudo_env('pip3')} install -U setuptools > #{detect_debug}
                   #{sudo_env('pip3')} install ansible#{ansible_version} > #{detect_debug}
                 fi

data/provisioner_options.md

@@ -28,6 +28,21 @@ It installs it in the following order:
 
 NOTE:  Set to ansible_package_name to 'ansible' when installing from the CentOS/Redhat extras repo, instead of the EPEL.
 
+# Install Options Maxtrix
+
+Install options require_XXXX parameter by operation system
+
+OS | repo | pip | pip3 | ansible_source | ansible_omnibus
+---|------|-----|------|----------------|----------------
+centos-72 | YES | YES | YES | NO | YES
+centos-8 | YES | NO | YES | NO | NO
+ubuntu-1604 | YES | YES | NO | NO | YES
+ubuntu-2004 | YES | NO | YES | NO | YES
+debian-9 | YES | YES | YES | NO | YES
+debian-10 | YES | YES | YES | NO | YES
+suse-15 | YES | YES | YES | NO | NO
+alpine-38 | UNTESTED | NO | NO | NO | NO
+
 # Provisioner Options
 
 kitchen-ansible runs the ansible playbook command http://linux.die.net/man/1/ansible-playbook with options from parameters in the kitchen.yml file:
@@ -53,7 +68,7 @@ ansible_omnibus_url | `https://raw.githubusercontent.com` `/neillturner/omnibus-
 ansible_package_name |  | Set to ansible when installing from the CentOS/Redhat extras repo, instead of the EPEL.
 ansible_platform | Naively tries to determine | OS platform of server
 ansible_playbook_command | | Override the Ansible playbook command
-ansible_sles_repo | `http://download.opensuse.org/repositories` `/systemsmanagement/SLE_12` `/systemsmanagement.repo` | Zypper SuSE Ansible repo
+ansible_sles_repo | `http://download.opensuse.org/repositories` `/systemsmanagement/openSUSE_Leap_15.2` `/systemsmanagement.repo` | Zypper SuSE Ansible repo
 ansible_source_url | `git://github.com/ansible/ansible.git` | Git URL of Ansible source
 ansible_source_rev | | Branch or tag to install Ansible source
 ansible_sudo | true | Determines whether `ansible-playbook` is executed as root or as the current authenticated user
@@ -94,7 +109,7 @@ modules_path | | Ansible repo manifests directory
 no_proxy | nil | List of URLs or IPs that should be excluded from proxying
 playbook | default.yml | Playbook for `ansible-playbook` to run
 private_key | | ssh private key file for ssh connection
-python_sles_repo | `http://download.opensuse.org/repositories` `/devel:/languages:/python/SLE_12` `/devel:languages:python.repo` | Zypper SuSE python repo
+python_sles_repo | `http://download.opensuse.org/repositories` `/devel:/languages:/python/openSUSE_Leap_15.2` `/devel:languages:python.repo` | Zypper SuSE python repo
 recursive_additional_copy_path | | Arbitrary array of files and directories to copy into test environment. See below section Copying Additional Files
 require_ansible_omnibus | false | Set to `true` if using Omnibus Ansible `pip` install
 require_ansible_repo | true | Set if installing Ansible from a `yum` or `apt` repo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.55.0
+  version: 0.56.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-03 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec