kitchen-ansible 0.51.0 → 0.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74eb7dd611a7bf5dba02f9efd7958f56476036ba7d47f4801da4bf205f662ac0
-  data.tar.gz: 4f21d7462726ebf52fce8816c047e95450e8fcbf17bcbfc1c2821c2c09490c9b
+  metadata.gz: bb3c0e10d572c5db59b9d6ecc8be05c0b62f227beb977f68b8c8b6b5e261a5f4
+  data.tar.gz: d33c5a241fab596f8dd4f849a2b5784eaac33d04ae3711a8cd8d1ff068ee9151
 SHA512:
-  metadata.gz: 438fa9cc8422b1da362bcfb8f61b4f2acb62ffb75400c116efbd10fa01eec3b2a2239a14a4f6fc19dfeed1b37e8530c221c2985557fbb4c7bd372e2ef76373c5
-  data.tar.gz: 3e34d003eca48a0577a430ddd2fd5afc084da58b239e360932b5431bd0eda327f7a19a0babaf95f6281957fede9a19079ed767216184d3cc5c6d3d29b99d92f5
+  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.51.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.
@@ -54,6 +54,7 @@ module Kitchen
         default_config :require_ruby_for_busser, false
         default_config :require_windows_support, false
         default_config :require_pip, false
+        default_config :require_pip3, false
         default_config :requirements_path, false
         default_config :requirements_collection_path, false
         default_config :ssh_known_hosts, nil
@@ -104,6 +105,12 @@ module Kitchen
             fail('No roles_path detected. Please specify one in .kitchen.yml')
         end
 
+        default_config :ansible_binary_path do |provisioner|
+          if provisioner[:require_pip3]
+            fail('No ansible_binary_path detected. Please specify one in .kitchen.yml')
+          end
+        end
+
         default_config :group_vars_path do |provisioner|
           provisioner.calculate_path('group_vars', :directory)
         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

@@ -76,6 +76,9 @@ module Kitchen
         elsif config[:require_pip]
           info('Installing ansible through pip')
           cmd = install_ansible_from_pip_command
+        elsif config[:require_pip3]
+          info('Installing ansible through pip3')
+          cmd = install_ansible_from_pip3_command
         elsif config[:require_ansible_repo]
           if !@os.nil?
             info("Installing ansible on #{@os.name}")
@@ -87,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}
@@ -308,7 +311,7 @@ module Kitchen
         commands = []
 
         commands << [
-          "if [ $(uname -s) == 'FreeBSD' ]; then ETC_ANSIBLE='/usr/local/etc/ansible'; else ETC_ANSIBLE='/etc/ansible'; fi"
+          "if [ $(uname -s) = 'FreeBSD' ]; then ETC_ANSIBLE='/usr/local/etc/ansible'; else ETC_ANSIBLE='/etc/ansible'; fi"
         ]
         # Prevent failure when ansible package installation doesn't contain /etc/ansible
         commands << [
@@ -540,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}
@@ -555,13 +562,45 @@ 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
           INSTALL
       end
 
+      def install_ansible_from_pip3_command
+              if config[:ansible_version]=='latest' or config[:ansible_version].nil?
+                ansible_version = ''
+              else
+                ansible_version = "==#{config[:ansible_version]}"
+              end
+                <<-INSTALL
+                  if [ ! $(which ansible) ]; then
+                    if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
+                      #{Kitchen::Provisioner::Ansible::Os::Redhat.new('redhat', config).install_epel_repo}
+                      #{update_packages_redhat_cmd} > #{detect_debug}
+                      #{sudo_env('yum')} -y install python3-libselinux python3-devel python3-pip git 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}
+                        #{update_packages_suse_cmd} > #{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 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
+                INSTALL
+      end
+
       def install_omnibus_command
         info('Installing ansible using ansible omnibus')
 
@@ -855,7 +894,16 @@ module Kitchen
 
       def extra_vars_file
         return nil if config[:extra_vars_file].nil?
-        bash_extra_vars = "-e '\@#{config[:extra_vars_file]}'"
+        bash_extra_vars = ''
+        if config[:extra_vars_file].is_a?(String)
+          bash_extra_vars = "-e '\@#{config[:extra_vars_file]}'"
+        elsif config[:extra_vars_file].is_a?(Array)
+          config[:extra_vars_file].each { |x|
+            info("Adding -e '\@#{x}'")
+            bash_extra_vars += " -e '\@#{x}'"
+          }
+        end
+
         debug(bash_extra_vars)
         bash_extra_vars
       end

data/provisioner_options.md

@@ -16,12 +16,33 @@ It installs it in the following order:
 
   Install require packages and then installs ansible using the python pip command and ansible version must be specified. This allows a specific version of ansible to be installed.
 
+* if require_pip3 is set to true
+
+  Install require packages and then installs ansible using the python pip3 command and ansible version must be specified. This allows a specific version of ansible to be installed.
+
+  Currently only works for Redhat/Centos.
+
 * if require_ansible_repo is set to true (the default)
 
   Installs from the operation system repository only with the ansible version that is in the particular repository and will use the ansible_version in the package name where appropriate.
 
 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:
@@ -47,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
@@ -66,7 +87,7 @@ custom_post_play_command | nil | Custom shell command to be used after the ansib
 enable_yum_epel | false | Enable the `yum` EPEL repo
 env_vars | Hash.new | Hash to set environment variable to use with `ansible-playbook` command
 extra_vars | Hash.new | Hash to set the `extra_vars` passed to `ansible-playbook` command
-extra_vars_file | nil | file containing environment variables e.g. `private_vars/production.yml site.yml` Don't prefix with a @ sign.
+extra_vars_file | nil | String containing a filename or an Array of filenames containing environment variables e.g. `private_vars/production.yml` or `[file1.yml, file2.yml]` Don't prefix with a @ sign.
 filter_plugins_path | filter_plugins | Ansible repo `filter_plugins` directory
 galaxy_ignore_certs | false | Ignore certificate errors when installing roles with ansible-galaxy.
 group_vars_path | group_vars | Ansible repo group_vars directory
@@ -88,13 +109,14 @@ 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
 require_ansible_source | false | Install Ansible from source using method described [here](http://docs.ansible.com/intro_installation.html#running-from-source). Only works on Debian/Ubuntu at present
 require_chef_for_busser | true | Install Chef to run Busser for tests. NOTE: kitchen 1.4 only requires Ruby to run Busser so this is not required.
 require_pip | false | Set to `true` if Ansible is to be installed through `pip`).
+require_pip3 | false | Set to `true` if Ansible is to be installed through `pip3`).
 require_ruby_for_busser | false | Install Ruby to run Busser for tests
 require_windows_support | false | Install [Windows support](http://docs.ansible.com/ansible/intro_windows.html)
 requirements_path | | Path to Ansible Galaxy requirements
@@ -110,6 +132,19 @@ update_package_repos | true | Update OS repository metadata
 wait_for_retry | 30 | number of seconds to wait before retrying converge command
 ignore_ansible_cfg | false | If true, values from ansible.cfg file will not be loaded.
 
+## require_pip3
+
+if using python 3 and wish to install via pip specify
+```yaml
+  ansible_binary_path: /usr/local/bin
+  require_pip3: true
+```
+
+
+you must specify ansible_binary_path as well.
+
+Currently this only works for Centos and Redhat
+
 ## Ansible Inventory
 
 Ansible has the concept of an [inventory](http://docs.ansible.com/ansible/latest/intro_inventory.html).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.51.0
+  version: 0.56.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ansible provisioner for test-kitchen