kitchen-ansible 0.51.0 → 0.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74eb7dd611a7bf5dba02f9efd7958f56476036ba7d47f4801da4bf205f662ac0
-  data.tar.gz: 4f21d7462726ebf52fce8816c047e95450e8fcbf17bcbfc1c2821c2c09490c9b
+  metadata.gz: fcf3c0b3410c365569e9b26c6e5266f1b3217a7af788440c9bc67770578d029f
+  data.tar.gz: e34eb4cbb1f2f5281f3ca066e73d7a72e50bc315856b9bb5837d74b0cc6fe9b8
 SHA512:
-  metadata.gz: 438fa9cc8422b1da362bcfb8f61b4f2acb62ffb75400c116efbd10fa01eec3b2a2239a14a4f6fc19dfeed1b37e8530c221c2985557fbb4c7bd372e2ef76373c5
-  data.tar.gz: 3e34d003eca48a0577a430ddd2fd5afc084da58b239e360932b5431bd0eda327f7a19a0babaf95f6281957fede9a19079ed767216184d3cc5c6d3d29b99d92f5
+  metadata.gz: 5859df7d528ca944d8f2547aef1ca0a0d6aa9cbc8efa0cb0a6e545fa531d84dbe9b87819b72fff5d0554b437a2564ff1d173578b2d0602639baf8d445424ca89
+  data.tar.gz: 8280cd6d6edf1fd87f67233c72548920971a6ed74939785e29e26a9b9488a438011c065e69a0669db226dd14834be1f0cbba0ed1c2ab7488b3883cc6ba27ef7e

data/lib/kitchen-ansible/version.rb

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

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

@@ -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_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}")
@@ -562,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')
 

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.
@@ -95,6 +101,7 @@ 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
@@ -110,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.51.0
+  version: 0.52.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec