kitchen-ansible 0.50.1 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12f00ffe0cf6ec8436074b5fffcfbf108a8b382a6f5b0ea916214bbc139a8994
-  data.tar.gz: 5ccb79c952524c5dc2388a89459b8c3c0b2265a9cf4f0fc4b534b3e1008efb4c
+  metadata.gz: 74eb7dd611a7bf5dba02f9efd7958f56476036ba7d47f4801da4bf205f662ac0
+  data.tar.gz: 4f21d7462726ebf52fce8816c047e95450e8fcbf17bcbfc1c2821c2c09490c9b
 SHA512:
-  metadata.gz: 8d8b98e8cc45cf4f18c4b291af31e8dea39748ef0a1110af663508eb9714f82e0f4f7c14cdad2d60bed6e2600b84da51a2b57c43fa12187c090dccf4fefd7f6f
-  data.tar.gz: 4c9cfc4c83fe4a99bbf86cca8c0a1cd69dfea00838b9a5df2bbe056e3f6c22c3dcea3daaa7babf885c8fd5b09eb1372e666b1bba9938f868b92078313df362ee
+  metadata.gz: 438fa9cc8422b1da362bcfb8f61b4f2acb62ffb75400c116efbd10fa01eec3b2a2239a14a4f6fc19dfeed1b37e8530c221c2985557fbb4c7bd372e2ef76373c5
+  data.tar.gz: 3e34d003eca48a0577a430ddd2fd5afc084da58b239e360932b5431bd0eda327f7a19a0babaf95f6281957fede9a19079ed767216184d3cc5c6d3d29b99d92f5

data/lib/kitchen-ansible/version.rb

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

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

@@ -55,6 +55,7 @@ module Kitchen
         default_config :require_windows_support, false
         default_config :require_pip, 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

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

@@ -57,7 +57,7 @@ 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

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

@@ -264,7 +264,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]}"
@@ -373,6 +373,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 +477,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
@@ -629,6 +645,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(' ')

data/provisioner_options.md

@@ -98,6 +98,7 @@ require_pip | false | Set to `true` if Ansible is to be installed through `pip`)
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.50.1
+  version: 0.51.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-23 00:00:00.000000000 Z
+date: 2020-06-11 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.0.3
 signing_key: 
 specification_version: 4
 summary: ansible provisioner for test-kitchen