kitchen-ansible 0.0.5 → 0.0.6

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Ansible
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -46,6 +46,7 @@ module Kitchen
       default_config :ansible_version, nil
       default_config :require_ansible_repo, true
       default_config :extra_vars, {}
+      default_config :tags, []
       default_config :ansible_apt_repo, "ppa:ansible/ansible"
       default_config :ansible_yum_repo, "https://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm"
       default_config :chef_bootstrap_url, "https://www.getchef.com/chef/install.sh"
@@ -309,6 +310,7 @@ module Kitchen
             ansible_verbose_flag,
             ansible_check_flag,
             extra_vars,
+            tags,
             "#{File.join(config[:root_path], File.basename(config[:playbook]))}",
           ].join(" ")
         end
@@ -403,13 +405,28 @@ module Kitchen
         end
 
         def extra_vars
-          return nil if config[:extra_vars].none?
-          bash_vars = JSON.dump(config[:extra_vars])
+          bash_vars = config[:extra_vars]
+          if config.key?(:attributes) && config[:attributes].key?(:extra_vars) && config[:attributes][:extra_vars].is_a?(Hash)
+            bash_vars = config[:attributes][:extra_vars]
+          end
+
+          return nil if bash_vars.none?
+          bash_vars = JSON.dump(bash_vars)
           bash_vars = "-e '#{bash_vars}'"
           debug(bash_vars)
           bash_vars
         end
 
+        def tags
+          bash_tags = config.key?(:attributes) && config[:attributes].key?(:tags) && config[:attributes][:tags].is_a?(Array) ? config[:attributes][:tags] : config[:tags]
+          return nil if bash_tags.empty?
+
+          bash_tags = bash_tags.join(",")
+          bash_tags = "-t '#{bash_tags}'"
+          debug(bash_tags)
+          bash_tags
+        end
+
         def ansible_apt_repo
           config[:ansible_apt_repo]
         end

data/provisioner_options.md

@@ -6,7 +6,7 @@ key | default value | Notes
 ansible_version | "latest"| desired version, affects apt installs
 ansible_platform | naively tries to determine | OS platform of server
 require_ansible_repo | true | Set if using a ansible install from yum or apt repo
-ansible_apt_repo | "ppa:rquillo/ansible"| apt repo
+ansible_apt_repo | "ppa:ansible/ansible"| apt repo
 ansible_yum_repo | "https://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm"| yum repo
 require_ansible_omnibus | false | Set if using omnibus ansible install
 ansible_omnibus_url | | omnibus ansible install location.
@@ -53,11 +53,16 @@ The provisioner can be configured globally or per suite, global settings act as
 
 in this example, vagrant will download a box for ubuntu 1204 with no configuration management installed, then install the latest ansible and ansible playbook against a ansible repo from the /repository/ansible_repo directory using the defailt manifest site.yml
 
-To override a setting at the suite-level, specify the setting name under the suite:
+To override a setting at the suite-level, specify the setting name under the suite's attributes:
 
     suites:
-     - name: default
-       playbook: foobar.yml
+     - name: server
+       attributes:
+         extra_vars:
+           server_installer_url: http://downloads.app.com/v1.0
+         tags:
+           - server
+
 
 ### Per-suite Structure
 

metadata

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