kitchen-ansible 0.0.8 → 0.0.9

data/README.md

@@ -43,3 +43,78 @@ platforms:
       - ['forwarded_port', {guest: 8080, host: 8080}]
       - [ 'private_network', { ip: '192.168.33.11' } ]
 ```
+
+## Test-Kitchen/Ansible/Serverspec
+
+In the root directory for your Ansible role:
+
+Create a `.kitchen.yml`, much like one the described above:
+
+      ---
+      driver:
+        name: vagrant
+
+      provisioner:
+        name: ansible_playbook
+        playbook: default.yml
+        ansible_yum_repo: "https://download.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm"
+        ansible_verbose: true
+        ansible_verbosity: 3
+        hosts: all
+
+      platforms:
+        - name: ubuntu-12.04
+          driver_config:
+            box: ubuntu/precise32
+        - name: centos-7
+          driver_config:
+             box: chef/centos-7.0
+
+      suites:
+        - name: default
+
+Then for serverspec:
+
+      mkdir -p test/integration/default/serverspec/localhost
+      echo "require 'serverspec'" >> test/integration/default/serverspec/spec_helper.rb
+      echo "set :backend, :exec" >> test/integration/default/serverspec/spec_helper.rb
+
+Create a basic playbook `test/integration/default.yml` so that kitchen can use your role (this should include any dependencies for your role):
+
+      ---
+      - name: wrapper playbook for kitchen testing "my_role"
+        hosts: localhost
+        roles:
+          - my_role
+
+Create your serverspec tests in `test/integration/default/serverspec/localhost/my_roles_spec.rb`:
+
+      require 'spec_helper'
+
+      if os[:family] == 'ubuntu'
+            describe '/etc/lsb-release' do
+              it "exists" do
+                  expect(file('/etc/lsb-release').to be_file
+              end
+            end
+      end
+
+      if os[:family] == 'redhat'
+        describe '/etc/redhat-release' do
+          it "exists" do
+              expect(file('/etc/redhat-release')).to be_file
+          end
+        end
+      end
+
+*Notes*
+
+* The `default` in all of the above is the name of the test suite defined in the 'suites' section of your `.kitchen.yml`, so if you have more than suite of tests or change the name, you'll need to adapt my example accordingly.
+* serverspec test files *must* be named `_spec.rb`
+* Since I'm using Vagrant, my `box` definitions refer to Vagrant boxes, either standard, published boxes available from <http://atlas.hashicorp.com/boxes> or custom-created boxes (perhaps using [Packer][packer] and [bento][bento]), in which case you'll need to provide the url in `box_url`.
+* This could be adapted to using Openstack/AWS/whatever VMs as supported by Vagrant.
+
+[Serverspec]: http://serverspec.org
+[packer]: https://packer.io
+[bento]: https://github.com/chef/bento
+

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Ansible
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -84,7 +84,8 @@ module Kitchen
       default_config :requirements_path, false
       default_config :ansible_verbose, false
       default_config :ansible_verbosity, 1
-      default_config :ansible_noop, false   # what is ansible equivalent of dry_run???? ##JMC: I think it's [--check mode](http://docs.ansible.com/playbooks_checkmode.html) TODO: Look into this...
+      default_config :ansible_check, false
+      default_config :ansible_diff, false
       default_config :ansible_platform, ''
       default_config :update_package_repos, true
 
@@ -314,6 +315,7 @@ module Kitchen
             "-M #{File.join(config[:root_path], 'modules')}",
             ansible_verbose_flag,
             ansible_check_flag,
+            ansible_diff_flag,
             extra_vars,
             tags,
             "#{File.join(config[:root_path], File.basename(config[:playbook]))}",
@@ -401,6 +403,10 @@ module Kitchen
           config[:ansible_check] ? '--check' : nil
         end
 
+        def ansible_diff_flag
+          config[:ansible_diff] ? '--diff' : nil
+        end
+
         def ansible_platform
           config[:ansible_platform].to_s.downcase
         end

data/provisioner_options.md

@@ -20,6 +20,8 @@ playbook | 'site.yml' | playbook for ansible-playbook to run
 modules_path | | ansible repo manifests directory
 ansible_verbose| false| Extra information logging
 ansible_verbosity| 1| Sets the verbosity flag appropriately (e.g.: `1 => '-v', 2 => '-vv', 3 => '-vvv" ...`) Valid values are one of: `1, 2, 3, 4` OR `:info, :warn, :debug, :trace`.
+ansible_check| false| Sets the `--check` flag when running Ansible
+ansible_diff| false| Sets the `--diff` flag when running Ansible
 update_package_repos| true| update OS repository metadata
 chef_bootstrap_url |"https://www.getchef.com/chef/install.sh"| the chef (needed for busser to run tests)
 ansiblefile_path | | Path to Ansiblefile
@@ -40,6 +42,7 @@ The provisioner can be configured globally or per suite, global settings act as
       require_ansible_repo: true
       ansible_verbose: true
       ansible_verbosity: 2
+      ansible_diff: true
 
     platforms:
     - name: nocm_ubuntu-12.04

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies: []
 description: ! '== DESCRIPTION: