kitchen-ansible 0.0.10 → 0.0.11

data/README.md

@@ -18,7 +18,8 @@ Please see the Provisioner Options (https://github.com/neillturner/kitchen-ansib
 ## Example kitchen.yml file
 
 based on the example ansible setup for tomcat at  https://github.com/ansible/ansible-examples/tree/master/tomcat-standalone
-```
+
+```yaml
 ---
 driver:
     name: vagrant
@@ -49,63 +50,100 @@ platforms:
 In the root directory for your Ansible role:
 
 Create a `.kitchen.yml`, much like one the described above:
+    
+```yaml
+  ---
+  driver:
+    name: vagrant
 
-      ---
-      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
+  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
+    
+```bash
+  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
+    
+```yaml
+  ---
+  - 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`:
+    
+```ruby
+  require 'spec_helper'
 
-      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
+  if os[:family] == 'ubuntu'
+        describe '/etc/lsb-release' do
           it "exists" do
-              expect(file('/etc/redhat-release')).to be_file
+              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
+```
+
+### Testing multiple playbooks
+To test different playbooks in different suites you can easily overwrite the provisioner settings in each suite seperately.
+```yaml
+---
+  driver:
+    name: vagrant
+
+  provisioner:
+    name: ansible_playbook
+
+  platforms:
+    - name: ubuntu-12.04
+      driver_config:
+        box: ubuntu/precise32
+    - name: centos-7
+      driver_config:
+         box: chef/centos-7.0
+
+  suites:
+    - name: database
+      provisioner:
+        playbook: postgres.yml
+        hosts: database
+    - name: application
+      provisioner:
+        playbook: web_app.yml
+        hosts: web_application
+```
 
 *Notes*
 

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Ansible
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -303,7 +303,8 @@ module Kitchen
 
           if galaxy_requirements
             commands << [
-               sudo('ansible-galaxy'), 'install', '--force',
+               'ansible-galaxy', 'install', '--force',
+               '-p', File.join(config[:root_path], 'roles'),
                '-r', File.join(config[:root_path], galaxy_requirements),
             ].join(' ')
           end

metadata

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