kitchen-ansible 0.40.1 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2da321129b9d2bddb85702ed6a61e8fdd7789b20
-  data.tar.gz: 630edeac9b8a0d9150215e433ce062ee3e638ed4
+  metadata.gz: c49ee3c2a66571122b0b5f9f9a275ee76ac531ec
+  data.tar.gz: 538a482c315ee52137a0967099d4aaebcbb0231f
 SHA512:
-  metadata.gz: 27d52967de43e07a633f3dd66f85e353561ed87ff62c3f8b2809f79fc10813b3d373322e500fdaf925686147c82923c3b94d10b421e85482dd6fd4df95a42bdf
-  data.tar.gz: 985d2162e32ea7b62023daf1e870ddeca7bbf6f0305bef65087d01f2112d4117b764bdbc2999827550ee390e83d05a5774470d0d394fe963071b49d41bb1a757
+  metadata.gz: 99fbcd27f38933982f2178cb5fd180db04cedd3b037156b2b53fa3f654f6e291a604e1a61ada3983ca36fa7ffd1b61ae087b0d4fc3c19d54c1257e5cfb84dd5a
+  data.tar.gz: 40da82b0882a67494a6c2c51a7d365fe0a5767a0f10620371d7a311043ffaad371708769ad91016befcf845ee6e7df3de3ab7a999881bf1ff9c0db9544764b9b

data/README.md

@@ -56,7 +56,7 @@ platforms:
 
 ## Test-Kitchen Ansible Windows Support
 
-Windows is supported by created a lunix server to run ansible with software required to support winrm. Then winrm connection is used to configure the windows server.
+Windows is supported by creating a linux server to run ansible with software required to support winrm. Then the winrm connection is used to configure the windows server.
 
 In kitchen.yml set
 
@@ -66,7 +66,7 @@ In kitchen.yml set
   require_chef_for_busser: false
 ```
 
-See example [https://github.com/neillturner/ansible_windows_repo](https://github.com/neillturner/ansible_windows_repo)
+See example [https://github.com/neillturner/ansible_windows_repo](https://github.com/neillturner/ansible_windows_repo).
 
 
 ## Ruby install to run serverspec verify
@@ -105,14 +105,12 @@ Please see the [Provisioner Options](https://github.com/neillturner/kitchen-ansi
 
 ## Test-Kitchen Ansiblespec
 
-By using kitchen-verifier-serverspec and the Runner ansiblespec_runner tests can be against multiple servers with multiple roles in the ansiblespec format.
+By using kitchen-verifier-serverspec and the Runner ansiblespec_runner tests can be run against multiple servers with multiple roles in the ansiblespec format.
 
 Serverspec uses ssh to communicate with the server to be tested and reads the ansible playbook and inventory files to determine the hosts to test and the roles for each host.
 
 See example [https://github.com/neillturner/ansible_repo](https://github.com/neillturner/ansible_repo)
 
-
-
 ### Example usage to create tomcat servers:
 
 ![test-kitchen, ansible and ansiblespec](https://github.com/neillturner/ansible_repo/blob/master/kitchen-ansible.png "test-kitchen, ansible and ansiblespec")

data/kitchen-ansible.gemspec

@@ -32,4 +32,9 @@ EOF
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
   s.add_runtime_dependency 'librarian-ansible'
+  if RUBY_VERSION >= '2.0'
+    s.add_dependency 'net-ssh', '~> 3.0'
+  else
+    s.add_dependency 'net-ssh', '~> 2.9'
+  end
 end

data/lib/kitchen-ansible/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 module Kitchen
   module Ansible
-    VERSION = '0.40.1'
+    VERSION = '0.41.0'
   end
 end

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

@@ -28,7 +28,7 @@ module Kitchen
             if [ ! $(which ansible) ]; then
               #{install_epel_repo}
               #{sudo_env('yum-config-manager')} --enable epel/x86_64
-              #{sudo_env('yum')} -y install ansible#{ansible_redhat_version} git
+              #{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

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

@@ -29,7 +29,7 @@ module Kitchen
             #{install_epel_repo}
             #{redhat_yum_repo}
             #{update_packages_command}
-            #{sudo_env('yum')} -y install ansible#{ansible_redhat_version} libselinux-python git
+            #{sudo_env('yum')} -y install #{ansible_package_name} libselinux-python git
             fi
             INSTALL
           end
@@ -42,8 +42,12 @@ module Kitchen
             @config[:enable_yum_epel] ? sudo_env('yum install epel-release -y') : nil
           end
 
-          def ansible_redhat_version
-            @config[:ansible_version] ? "-#{@config[:ansible_version]}" : nil
+          def ansible_package_name
+            if @config[:ansible_version] == 'latest' || @config[:ansible_version] == nil
+              "ansible"
+            else
+              "ansible-#{@config[:ansible_version]}"
+            end
           end
 
           def redhat_yum_repo

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -184,6 +184,13 @@ module Kitchen
                     PACKAGES="ruby ruby-dev ruby2.1 ruby2.1-dev"
                   fi
                 fi
+                if [ "$(lsb_release -si)" = "Ubuntu" ]; then
+                  ubuntuvers=$(lsb_release -sr | tr -d .)
+                  if [ $ubuntuvers -ge 1410 ]; then
+                    # Default ruby is 2.x in utopic and newer
+                    PACKAGES="ruby ruby-dev ruby2.1 ruby2.1-dev"
+                  fi
+                fi
                 #{sudo_env('apt-get')} -y install $PACKAGES
                 if [ $debvers -eq 6 ]; then
                     # in squeeze we need to update alternatives
@@ -354,7 +361,7 @@ module Kitchen
             cmd,
             ansible_inventory_flag,
             ansible_limit_flag,
-            "-c #{config[:ansible_connection]}",
+            ansible_connection_flag,
             "-M #{File.join(config[:root_path], 'modules')}",
             ansible_verbose_flag,
             ansible_check_flag,
@@ -563,6 +570,7 @@ module Kitchen
       end
 
       def ansible_inventory
+        return nil if config[:ansible_inventory] == 'none'
         config[:ansible_inventory] = config[:ansible_inventory_file] if config[:ansible_inventory].nil?
         info('ansible_inventory_file parameter deprecated use ansible_inventory') if config[:ansible_inventory_file]
         config[:ansible_inventory]
@@ -572,6 +580,10 @@ module Kitchen
         config[:ansible_version] ? "=#{config[:ansible_version]}" : nil
       end
 
+      def ansible_connection_flag
+        "-c #{config[:ansible_connection]}" if config[:ansible_connection] != 'none'
+      end
+
       def ansible_verbose_flag
         config[:ansible_verbose] ? '-' << ('v' * verbosity_level(config[:ansible_verbosity])) : nil
       end
@@ -590,7 +602,8 @@ module Kitchen
       end
 
       def ansible_inventory_flag
-        config[:ansible_inventory] ? "-i #{File.join(config[:root_path], File.basename(config[:ansible_inventory]))}" : "-i #{File.join(config[:root_path], 'hosts')}"
+        return nil if config[:ansible_inventory] == 'none'
+        ansible_inventory ? "-i #{File.join(config[:root_path], File.basename(ansible_inventory))}" : "-i #{File.join(config[:root_path], 'hosts')}"
       end
 
       def ansible_limit_flag

data/provisioner_options.md

@@ -22,10 +22,10 @@ no_proxy | nil | list of URLs or IPs that should be excluded from proxying
 roles_path | roles | ansible repo roles directory
 group_vars_path | group_vars | ansible repo group_vars directory
 host_vars_path | host_vars | ansible repo hosts directory
-library_plugins | library | ansible repo library plugins directory
-callback_plugins | callback_plugins | ansible repo callback_plugins directory
-filter_plugins | filter_plugins | ansible repo filter_plugins directory
-lookup_plugins | lookup_plugins | ansible repo lookup_plugins directory
+library_plugins_path | library | ansible repo library plugins directory
+callback_plugins_path | callback_plugins | ansible repo callback_plugins directory
+filter_plugins_path | filter_plugins | ansible repo filter_plugins directory
+lookup_plugins_path | lookup_plugins | ansible repo lookup_plugins directory
 additional_copy_path | | arbitrary array of files and directories to copy into test environment, relative to CWD. (eg, vars or included playbooks)
 extra_vars | Hash.new | Hash to set the extra_vars passed to ansibile-playbook command
 playbook | 'default.yml' | playbook for ansible-playbook to run
@@ -38,9 +38,9 @@ update_package_repos| true| update OS repository metadata
 ansiblefile_path | | Path to Ansiblefile
 requirements_path | | Path to ansible-galaxy requirements
 ansible_vault_password_file| | Path of Ansible Vault Password File
-ansible_connection | local | use 'ssh' if host not localhost
+ansible_connection | local | use 'ssh' if host not localhost or 'winrm' for windows or 'none' if defined in inventory.
 hosts |  | create ansible hosts file for localhost with this server group
-ansible_inventory |  | Static or dynamic inventory file or directory.
+ansible_inventory |  | Static or dynamic inventory file or directory or 'none' if defined in ansible.cfg.
 ansible_limit |  | Further limits the selected host/group patterns.
 ansible_extra_flags |  | Additional options to pass to `ansible-playbook` -- e.g.: `'--skip-tags=redis'`
 ansible_playbook_command | | Override the ansible playbook command
@@ -54,7 +54,7 @@ private_key | | ssh private key file for ssh connection
 idempotency_test | false | Enable to test ansible playbook idempotency
 ssh_known_hosts | | List of hosts that should be added to `~/.ssh/known_hosts`
 kerberos_conf_file| | Path of krb5.conf file using in windows support
-require_windows_support | false | install windows support: http://docs.ansible.com/ansible/intro_windows.html 
+require_windows_support | false | install windows support: http://docs.ansible.com/ansible/intro_windows.html
 
 ## Configuring Provisioner Options
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.40.1
+  version: 0.41.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: |+
   == DESCRIPTION: