kitchen-ansible 0.47.5 → 0.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 753b852017bf40e2b0d8475504942dd2c1b266a3
-  data.tar.gz: 167d66e0bf1a88fc489bdab25490276a3c8c150d
+  metadata.gz: 3000b4a33dd946e4d64314ffad1c930373e1217f
+  data.tar.gz: 9f819154af5b31230a5a086072b3d7a80d8846ad
 SHA512:
-  metadata.gz: 86c957789cc61fd3742cae67afb82010ae32a384be9c90217403daf82444d120cd4ea08e2cc99e15ca388ab14707c9a697f4967a60d8930602b6f91c6ab2fd55
-  data.tar.gz: 29c481a0c8d216199c8c88af911fac9b37c3c79556a3015dee857ec450d4684dbc384b298db5b56e012ab608445857c937697b688a7efdfe38fdf8448c632572
+  metadata.gz: 5b51e9f86170bb3e3eeb0522e27381b8335a851666243267fee6cbe72154bb5829d3ea7fb7d0522d80004bee8e18528c4711b666364f4093e4caca1b236439a1
+  data.tar.gz: 4fdec37b3da4fd7db358800bcaf31bb0af5817865ace15e476e950cc6b811db714c4b8bbbe59912fb6402160e9618ad29d8dfdf2c7a6a43b4a6194a4638074ae

data/README.md

@@ -17,7 +17,14 @@ It has been tested against the Ubuntu 12.04/14.04/16.04, Centos 6/7 and Debian 6
 - a driver box without a Chef installation so Ansible can be installed.
 
 ## Installation & Setup
-Install the `kitchen-ansible` gem in your system, along with [kitchen-vagrant](https://github.com/test-kitchen/kitchen-vagrant) or [kitchen-docker](https://github.com/test-kitchen/kitchen-docker) or any other suitable driver:
+
+1. install the latest Ruby on your workstations (for windows see https://rubyinstaller.org/downloads/)
+
+2. If using Ruby version less than 2.3 first install earlier version of test-kitchen
+```
+gem install test-kitchen -v 1.16.0
+```
+3. Install the `kitchen-ansible` gem in your system, along with [kitchen-vagrant](https://github.com/test-kitchen/kitchen-vagrant) or [kitchen-docker](https://github.com/test-kitchen/kitchen-docker) or any other suitable driver:
 
 ```
 gem install kitchen-ansible

data/lib/kitchen-ansible/version.rb

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

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

@@ -25,6 +25,7 @@ require 'kitchen/provisioner/ansible/os/amazon'
 require 'kitchen/provisioner/ansible/os/suse'
 require 'kitchen/provisioner/ansible/os/darwin'
 require 'kitchen/provisioner/ansible/os/alpine'
+require 'kitchen/provisioner/ansible/os/openbsd'
 
 module Kitchen
   module Provisioner
@@ -55,6 +56,8 @@ module Kitchen
             return Darwin.new(platform, config)
           when 'alpine'
             return Alpine.new(platform, config)
+          when 'openbsd'
+            return Openbsd.new(platform, config)
           end
 
           nil

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

@@ -25,7 +25,7 @@ module Kitchen
 
           def install_command
             <<-INSTALL
-            /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+            /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" </dev/null
             /usr/local/bin/brew install ansible
             INSTALL
           end

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

@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Marcin Wolny (<marcin@wutanic.com>)
+#
+# Copyright (C) 2015 Marcin Wolny
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Kitchen
+  module Provisioner
+    module Ansible
+      class Os
+        class Openbsd < Os
+
+          def install_command
+            <<-INSTALL
+            sudo pkg_add ansible--
+            INSTALL
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -42,11 +42,21 @@ module Kitchen
             @config[:enable_yum_epel] ? sudo_env('yum install epel-release -y') : nil
           end
 
+          def ansible_package_version_suffix
+            return unless @config[:ansible_version] && @config[:ansible_version] != 'latest'
+
+            if @config[:ansible_package_name]
+              "-#{@config[:ansible_version]}"
+            else
+              "#{@config[:ansible_version][0..2]}-#{@config[:ansible_version]}"
+            end
+          end
+
           def ansible_package_name
-            if @config[:ansible_version] == 'latest' || @config[:ansible_version] == nil
-              "ansible"
+            if @config[:ansible_package_name]
+              "#{@config[:ansible_package_name]}#{ansible_package_version_suffix}"
             else
-              "ansible#{@config[:ansible_version][0..2]}-#{@config[:ansible_version]}"
+              "ansible#{ansible_package_version_suffix}"
             end
           end
 

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -97,6 +97,8 @@ module Kitchen
                 #{Kitchen::Provisioner::Ansible::Os::Darwin.new('darwin', config).install_command}
               elif [ -f /etc/alpine-release ] || [ -d /etc/apk ]; then
                 #{Kitchen::Provisioner::Ansible::Os::Alpine.new('alpine', config).install_command}
+              elif [ $(uname -s) = "OpenBSD" ]; then
+                #{Kitchen::Provisioner::Ansible::Os::Openbsd.new('openbsd', config).install_command}
               else
                 #{Kitchen::Provisioner::Ansible::Os::Debian.new('debian', config).install_command}
               fi

data/provisioner_options.md

@@ -19,6 +19,8 @@ It installs it in the following order:
 * 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.
 
 # Provisioner Options
 
@@ -41,6 +43,7 @@ ansible_inventory |  | Static or dynamic inventory file or directory or 'none' i
 ansible_limit |  | Further limits the selected host/group patterns
 ansible_omnibus_remote_path | /opt/ansible | Server installation location of an Omnibus Ansible install
 ansible_omnibus_url | `https://raw.githubusercontent.com` `/neillturner/omnibus-ansible` `/master/ansible_install.sh` | Omnibus Ansible install location
+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
@@ -100,6 +103,66 @@ sudo_command | sudo -E | `sudo` command; change to `sudo -E -H` to be consistent
 update_package_repos | true | Update OS repository metadata
 wait_for_retry | 30 | number of seconds to wait before retrying converge command
 
+## Ansible Inventory 
+
+Ansible has the concept of an [inventory](http://docs.ansible.com/ansible/latest/intro_inventory.html).
+
+Ansible then connects to these servers and processes the playbook against the server.
+
+See also [Host inventories](https://ansible-tips-and-tricks.readthedocs.io/en/latest/ansible/inventory/).
+
+
+### ansible Inventory parameter 
+
+if you have an ansible inventory file you can specify it in the ansible_inventory parameter in the .kitchen.yml file.
+```yaml
+  ansible_inventory: myinventoryfile.txt
+```  
+or if you have an ansible.cfg  file specify
+```yaml
+  ansible_inventory: none 
+``` 
+it will look for the file in the root of your repository. 
+
+or it can be a directory from the root of your repository and contain scripts to implement [dynamic inventory](http://docs.ansible.com/ansible/latest/intro_dynamic_inventory.html) 
+
+### hosts parameter
+
+if you don't specify an inventory file then you must specify the hosts parameter in the .kitchen.yml file. 
+
+kitchen ansible uses this information to create a hosts file that is used by ansible with the ansible command is run. 
+  
+it can either be a name of a single server
+
+```yaml
+hosts: myhost 
+```
+
+or any array of hosts: 
+
+```yaml
+hosts: 
+  - myhost1
+  - myhost2
+```  
+
+the hosts file that is generated always contains in the first line 
+
+```yaml
+localhost ansible_connection=local
+```
+so that it will process against the locahost. 
+
+and it will create a hosts file that includes the hosts you specify
+
+```yaml
+localhost ansible_connection=local
+myhost1
+myhost2
+localhost
+```
+
+
 ## Copying Additional Files
 
 Several parameters have been developed rather organically to support the requirement to copy additional files beyond the ones in the standard ansible locations.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.47.5
+  version: 0.48.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -106,6 +106,7 @@ files:
 - lib/kitchen/provisioner/ansible/os/darwin.rb
 - lib/kitchen/provisioner/ansible/os/debian.rb
 - lib/kitchen/provisioner/ansible/os/fedora.rb
+- lib/kitchen/provisioner/ansible/os/openbsd.rb
 - lib/kitchen/provisioner/ansible/os/redhat.rb
 - lib/kitchen/provisioner/ansible/os/suse.rb
 - lib/kitchen/provisioner/ansible_playbook.rb