kitchen-ansible 0.50.1 → 0.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12f00ffe0cf6ec8436074b5fffcfbf108a8b382a6f5b0ea916214bbc139a8994
-  data.tar.gz: 5ccb79c952524c5dc2388a89459b8c3c0b2265a9cf4f0fc4b534b3e1008efb4c
+  metadata.gz: 3b1b9ed5296c5ccc0a6c0de5ed5dffda713e3cdfd36c835d6911591a89d92c40
+  data.tar.gz: 39ee501a044573823c5b1bf321d15d81ce9a557446ff664c917216f54723b21f
 SHA512:
-  metadata.gz: 8d8b98e8cc45cf4f18c4b291af31e8dea39748ef0a1110af663508eb9714f82e0f4f7c14cdad2d60bed6e2600b84da51a2b57c43fa12187c090dccf4fefd7f6f
-  data.tar.gz: 4c9cfc4c83fe4a99bbf86cca8c0a1cd69dfea00838b9a5df2bbe056e3f6c22c3dcea3daaa7babf885c8fd5b09eb1372e666b1bba9938f868b92078313df362ee
+  metadata.gz: 5c51f85d84585dbb8c888be34d11b877ec954de08230816767ac9754360798655b4a69f3414aebc6f415ed034dc21715ac35364ee1c0f74ad2a30343a90ab982
+  data.tar.gz: beecbbc16b179865e4e7123860462101857151105f8697821618f8feb21406ff241fe9dd61b4e737d64d4d4d6af7cb0471804ec0ef81eb5fdd2986df7ce8ecce

data/lib/kitchen-ansible/version.rb

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

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

@@ -54,7 +54,9 @@ 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
         default_config :additional_ssh_private_keys, nil
         default_config :ansible_verbose, false
@@ -103,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

@@ -57,13 +57,17 @@ module Kitchen
                 ## 10.04, 12.04 include add-apt-repository in
                 if [apt-cache pkgnames | grep -q 'python-software-properties']; then
                    #{sudo_env('apt-get')} -y install python-software-properties
-                fi   
+                fi
 
                 ## 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]}
+                ## 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/os/redhat.rb

@@ -29,7 +29,13 @@ module Kitchen
             #{install_epel_repo}
             #{redhat_yum_repo}
             #{update_packages_command}
-            #{sudo_env('yum')} -y install #{ansible_package_name} libselinux-python git
+            EL_RELEASE=$(rpm -E %{rhel})
+
+            if [ "${EL_RELEASE}" -lt 8 ]; then
+              #{sudo_env('yum')} -y install #{ansible_package_name} libselinux-python git
+            else
+              #{sudo_env('yum')} -y install #{ansible_package_name} python3-libselinux git
+            fi
             fi
             INSTALL
           end

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}
@@ -264,7 +267,7 @@ module Kitchen
       end
 
       def init_command
-        dirs = %w(modules roles group_vars host_vars)
+        dirs = %w(modules roles group_vars host_vars collections)
                .map { |dir| File.join(config[:root_path], dir) }.join(' ')
         cmd = "#{sudo_env('rm')} -rf #{dirs};"
         cmd += " mkdir -p #{config[:root_path]}"
@@ -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 << [
@@ -373,6 +376,10 @@ module Kitchen
           commands << ansible_galaxy_command
         end
 
+        if galaxy_requirements_collections
+          commands << ansible_galacy_collection_command
+        end
+
         if kerberos_conf_file
           commands << [
             sudo_env('cp -f'), File.join(config[:root_path], 'krb5.conf'), '/etc'
@@ -473,6 +480,18 @@ module Kitchen
         cmd
       end
 
+      def ansible_galacy_collection_command
+        cmd = [
+          'ansible-galaxy', 'collection', 'install', '--force',
+          '-p', File.join(config[:root_path], 'collections'),
+          '-r', File.join(config[:root_path], galaxy_requirements_collections)
+        ].join(' ')
+        cmd = "https_proxy=#{https_proxy} #{cmd}" if https_proxy
+        cmd = "http_proxy=#{http_proxy} #{cmd}" if http_proxy
+        cmd = "no_proxy=#{no_proxy} #{cmd}" if no_proxy
+        cmd
+      end
+
       def cd_ansible
        # this is not working so just return nil for now
        # File.exist?('ansible.cfg') ? "cd #{config[:root_path]};" : nil
@@ -546,6 +565,36 @@ module Kitchen
           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 python python-devel git python-setuptools python-pip 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}
+                      fi
+                    fi
+
+                  #{export_http_proxy}
+                  #{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')
 
@@ -629,6 +678,10 @@ module Kitchen
         config[:requirements_path] || nil
       end
 
+      def galaxy_requirements_collections
+        config[:requirements_collection_path] || nil
+      end
+
       def env_vars
         return nil if config[:env_vars].none?
         config[:env_vars].map { |k, v| "#{k}=#{v}" }.join(' ')
@@ -835,7 +888,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,6 +16,12 @@ 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.
@@ -66,7 +72,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
@@ -95,9 +101,11 @@ require_ansible_repo | true | Set if installing Ansible from a `yum` or `apt` re
 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
+requirements_collection_path | | Path to Ansible Galaxy requirements
 retry_on_exit_code | [] | Array of exit codes to retry converge command against
 role_name | | use when the repo name does not match the name the role is published as.
 roles_path | roles | Ansible repo roles directory
@@ -109,6 +117,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.50.1
+  version: 0.55.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-23 00:00:00.000000000 Z
+date: 2021-04-03 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.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ansible provisioner for test-kitchen