kitchen-ansible 0.0.1 → 0.0.2

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Ansible
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -50,7 +50,9 @@ module Kitchen
       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"
 
-      default_config :playbook, 'site.yml'
+      default_config :playbook do |provisioner|
+        provisioner.calculate_path('site.yml', :file)
+      end
 
       default_config :roles_path do |provisioner|
          provisioner.calculate_path('roles') or
@@ -74,24 +76,39 @@ module Kitchen
       end
 
       default_config :ansible_verbose, false
-      default_config :ansible_noop, false   # what is ansible equivalent of dry_run????
+      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_platform, ''
       default_config :update_package_repos, true
 
+      def verbosity_level(level = 1)
+        level = level.to_sym if level.is_a? String
+        log_levels = { :info => 1, :warn => 2, :debug => 3, :trace => 4 }
+        if level.is_a? Symbol and log_levels.include? level
+          # puts "Log Level is: #{log_levels[level]}"
+          log_levels[level]
+        elsif level.is_a? Integer and level > 0
+          # puts "Log Level is: #{level}"
+          level
+        else
+          raise 'Invalid ansible_verbosity setting.  Valid values are: 1, 2, 3, 4 OR :info, :warn, :debug, :trace'
+        end
+      end
 
-
-    #  def calculate_path(path, type = :directory)
-    #    base = config[:test_base_path]
-    #    candidates = []
-    #    candidates << File.join(base, instance.suite.name, 'ansible', path)
-    #    candidates << File.join(base, instance.suite.name, path)
-    #    candidates << File.join(base, path)
-    #    candidates << File.join(Dir.pwd, path)
-    #
-    #    candidates.find do |c|
-    #      type == :directory ? File.directory?(c) : File.file?(c)
-    #    end
-    #  end
+      def calculate_path(path, type = :directory)
+        base = config[:test_base_path]
+        candidates = []
+        candidates << File.join(base, instance.suite.name, 'ansible', path)
+        candidates << File.join(base, instance.suite.name, path)
+        candidates << File.join(base, path)
+        candidates << File.join(Dir.pwd, path)
+        candidates << File.join(Dir.pwd) if path == 'roles'
+    
+        debug("Calculating path for #{path}, candidates are: #{candidates.to_s}")
+        candidates.find do |c|
+          type == :directory ? File.directory?(c) : File.file?(c)
+        end
+      end
 
       def install_command
         return unless config[:require_ansible_omnibus] or config[:require_ansible_repo]
@@ -118,14 +135,29 @@ module Kitchen
           info("Installing ansible on #{ansible_platform}")
           <<-INSTALL
           if [ ! $(which ansible) ]; then
+            ## Install apt-utils to silence debconf warning: http://serverfault.com/q/358943/77156
+            #{sudo('apt-get')} -y install apt-utils
+            ## Fix debconf tty warning messages
+            export DEBIAN_FRONTEND=noninteractive
+            ## 13.10, 14.04 include add-apt-repository in software-properties-common
+            #{sudo('apt-get')} -y install software-properties-common
+            ## 10.04, 12.04 include add-apt-repository in 
+            #{sudo('apt-get')} -y install python-software-properties
           #  #{sudo('wget')} #{ansible_apt_repo}
           #  #{sudo('dpkg')} -i #{ansible_apt_repo_file}
+          #  #{sudo('apt-get')} -y autoremove ## These autoremove/autoclean are sometimes useful but
+          #  #{sudo('apt-get')} -y autoclean  ## don't seem necessary for the Ubuntu OpsCode bento boxes that are not EOL by Canonical
           #  #{update_packages_debian_cmd}
-          #  #{sudo('apt-get')} -y install ansible#{ansible_debian_version}
-            #{sudo('add-apt-repository')} #{ansible_apt_repo}
-	    #{sudo('apt-get')} update
+          #  #{sudo('apt-get')} -y --force-yes install ansible#{ansible_debian_version} python-selinux
+            ## 10.04 version of add-apt-repository doesn't accept --yes
+            ## later versions require interaction from user, so we must specify --yes
+            ## First try with -y flag, else if it fails, try without.
+            ## "add-apt-repository: error: no such option: -y" is returned but is ok to ignore, we just retry
+            #{sudo('add-apt-repository')} -y #{ansible_apt_repo} || #{sudo('add-apt-repository')} #{ansible_apt_repo}
+            #{sudo('apt-get')} update
             #{sudo('apt-get')} -y install ansible
-
+            ## This test works on ubuntu to test if ansible repo has been installed via rquillo ppa repo
+            ## if [ $(apt-cache madison ansible | grep -c rquillo ) -gt 0 ]; then echo 'success'; else echo 'fail'; fi
           fi
           #{install_busser}
           INSTALL
@@ -135,7 +167,7 @@ module Kitchen
           if [ ! $(which ansible) ]; then
             #{sudo('rpm')} -ivh #{ansible_yum_repo}
             #{update_packages_redhat_cmd}
-            #{sudo('yum')} -y install ansible#{ansible_redhat_version}
+            #{sudo('yum')} -y install ansible#{ansible_redhat_version} libselinux-python
           fi
           #{install_busser}
           INSTALL
@@ -146,15 +178,31 @@ module Kitchen
             if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
                #{sudo('rpm')} -ivh #{ansible_yum_repo}
                #{update_packages_redhat_cmd}
-               #{sudo('yum')} -y install ansible#{ansible_redhat_version}
+               #{sudo('yum')} -y install ansible#{ansible_redhat_version} libselinux-python
             else
-           #   #{sudo('wget')} #{ansible_apt_repo}
-           #   #{sudo('dpkg')} -i #{ansible_apt_repo_file}
-           #   #{update_packages_debian_cmd}
-           #   #{sudo('apt-get')} -y install ansible#{ansible_debian_version}
-               #{sudo('add-apt-repository')} #{ansible_apt_repo}
-	       #{sudo('apt-get')} update
-               #{sudo('apt-get')} -y install ansible#{ansible_debian_version}
+           ## Install apt-utils to silence debconf warning: http://serverfault.com/q/358943/77156
+            #{sudo('apt-get')} -y install apt-utils
+            ## Fix debconf tty warning messages
+            export DEBIAN_FRONTEND=noninteractive
+            ## 13.10, 14.04 include add-apt-repository in software-properties-common
+            #{sudo('apt-get')} -y install software-properties-common
+            ## 10.04, 12.04 include add-apt-repository in 
+            #{sudo('apt-get')} -y install python-software-properties
+          #  #{sudo('wget')} #{ansible_apt_repo}
+          #  #{sudo('dpkg')} -i #{ansible_apt_repo_file}
+          #  #{sudo('apt-get')} -y autoremove ## These autoremove/autoclean are sometimes useful but
+          #  #{sudo('apt-get')} -y autoclean  ## don't seem necessary for the Ubuntu OpsCode bento boxes that are not EOL by Canonical
+          #  #{update_packages_debian_cmd}
+          #  #{sudo('apt-get')} -y --force-yes install ansible#{ansible_debian_version} python-selinux
+            ## 10.04 version of add-apt-repository doesn't accept --yes
+            ## later versions require interaction from user, so we must specify --yes
+            ## First try with -y flag, else if it fails, try without.
+            ## "add-apt-repository: error: no such option: -y" is returned but is ok to ignore, we just retry
+            #{sudo('add-apt-repository')} -y #{ansible_apt_repo} || #{sudo('add-apt-repository')} #{ansible_apt_repo}
+            #{sudo('apt-get')} update
+            #{sudo('apt-get')} -y install ansible
+            ## This test works on ubuntu to test if ansible repo has been installed via rquillo ppa repo
+            ## if [ $(apt-cache madison ansible | grep -c rquillo ) -gt 0 ]; then echo 'success'; else echo 'fail'; fi
             fi
           fi
           #{install_busser}
@@ -238,7 +286,7 @@ module Kitchen
             "-M #{File.join(config[:root_path], 'modules')}",
             ansible_verbose_flag,
             extra_vars,
-            "#{File.join(config[:root_path], config[:playbook])}",
+            "#{File.join(config[:root_path], File.basename(config[:playbook]))}",
           ].join(" ")
         end
 
@@ -251,10 +299,22 @@ module Kitchen
           end
         end
 
-        def tmpmodules_dir
+        def tmp_modules_dir
           File.join(sandbox_path, 'modules')
         end
 
+        def tmp_playbook_path
+          File.join(sandbox_path, File.basename(playbook))
+        end
+
+        def tmp_host_vars_dir
+          File.join(sandbox_path, 'host_vars')
+        end
+
+        def tmp_roles_dir
+          File.join(sandbox_path, 'roles')
+        end
+
         def ansiblefile
           config[:ansiblefile_path] or ''
         end
@@ -271,6 +331,10 @@ module Kitchen
           config[:roles_path]
         end
 
+        def role_name
+          File.basename(roles) == 'roles' ? '' : File.basename(roles)
+        end
+
         def modules
           config[:modules_path]
         end
@@ -292,7 +356,7 @@ module Kitchen
         end
 
         def ansible_verbose_flag
-          config[:ansible_verbose] ? '-v' : nil
+          config[:ansible_verbose] ? '-' << ('v' * verbosity_level(config[:ansible_verbosity])) : nil
         end
 
         def ansible_platform
@@ -309,8 +373,8 @@ module Kitchen
 
         def extra_vars
           return nil if config[:extra_vars].none?
-          bash_vars = config[:extra_vars].map { |k,v| "#{k}=#{v}" }.join(" ")
-          bash_vars = "-e \"#{bash_vars}\""
+          bash_vars = JSON.dump(config[:extra_vars])
+          bash_vars = "-e '#{bash_vars}'"
           debug(bash_vars)
           bash_vars
         end
@@ -334,10 +398,12 @@ module Kitchen
         def prepare_roles
           info('Preparing roles')
           debug("Using roles from #{roles}")
+          
+          # Detect whether we are running tests on a role
+          # If so, make sure to copy into VM so dir structure is like: /tmp/kitchen/roles/role_name
 
-          tmp_roles_dir = File.join(sandbox_path, 'roles')
-          FileUtils.mkdir_p(tmp_roles_dir)
-          FileUtils.cp_r(Dir.glob("#{roles}/*"), tmp_roles_dir)
+          FileUtils.mkdir_p(File.join(tmp_roles_dir, role_name))
+          FileUtils.cp_r(Dir.glob("#{roles}/*"), File.join(tmp_roles_dir, role_name))
         end
 
         # /etc/ansible/ansible.cfg should contain
@@ -351,9 +417,9 @@ module Kitchen
                file.write("#no roles path specified\n")
             end
           else
-            debug("Using role from #{roles}")
+            debug("Setting roles_path inside VM to #{File.join(config[:root_path], 'roles', role_name)}")
             File.open( ansible_config_file, "wb") do |file|
-               file.write("[defaults]\nroles_path = #{File.join(config[:root_path], roles)}\n")
+               file.write("[defaults]\nroles_path = #{File.join(config[:root_path], 'roles', role_name)}\n")
             end
           end
         end
@@ -377,8 +443,8 @@ module Kitchen
 
         def prepare_playbook
           info('Preparing playbook')
-          debug("Using playbook from #{playbook}")
-          FileUtils.cp_r(playbook, File.join(sandbox_path, playbook))
+          debug("Copying playbook from #{playbook} to #{tmp_playbook_path}")
+          FileUtils.cp_r(playbook, tmp_playbook_path)
         end
 
 
@@ -398,7 +464,6 @@ module Kitchen
 
         def prepare_host_vars
           info('Preparing host_vars')
-          tmp_host_vars_dir = File.join(sandbox_path, 'host_vars')
           FileUtils.mkdir_p(tmp_host_vars_dir)
 
           unless File.directory?(host_vars)
@@ -413,11 +478,11 @@ module Kitchen
         def prepare_modules
           info('Preparing modules')
 
-          FileUtils.mkdir_p(tmpmodules_dir)
+          FileUtils.mkdir_p(tmp_modules_dir)
 
           if modules && File.directory?(modules)
             debug("Using modules from #{modules}")
-            FileUtils.cp_r(Dir.glob("#{modules}/*"), tmpmodules_dir, remove_destination: true)
+            FileUtils.cp_r(Dir.glob("#{modules}/*"), tmp_modules_dir, remove_destination: true)
           else
             info 'nothing to do for modules'
           end
@@ -428,7 +493,7 @@ module Kitchen
 
         def resolve_with_librarian
           Kitchen.mutex.synchronize do
-            Ansible::Librarian.new(ansiblefile, tmpmodules_dir, logger).resolve
+            Ansible::Librarian.new(ansiblefile, tmp_modules_dir, logger).resolve
           end
         end
     end

data/provisioner_options.md

@@ -18,6 +18,7 @@ extra_vars | Hash.new | Hash to set the extra_vars passed to ansibile-playbook c
 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`.
 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 Aansiblefile
@@ -36,6 +37,7 @@ The provisioner can be configured globally or per suite, global settings act as
       hosts: tomcat-servers
       require_ansible_repo: true
       ansible_verbose: true
+      ansible_verbosity: 2
 
     platforms:
     - name: nocm_ubuntu-12.04

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
+  prerelease: 
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies: []
 description: ! '== DESCRIPTION:
 
@@ -34,29 +35,29 @@ files:
 - lib/kitchen-ansible/version.rb
 - lib/kitchen/provisioner/ansible/librarian.rb
 - lib/kitchen/provisioner/ansible_playbook.rb
-- lib/kitchen/provisioner/ansible_playbook_spec.rb
 - provisioner_options.md
 homepage: https://github.com/neillturner/kitchen-ansible
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ! '[none]'
-rubygems_version: 2.3.0
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: ansible provisioner for test-kitchen
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDdjMTc4NWYzMTQ1ZjJiODIyY2UzNDhlMDZkNDc4MmUxNTdlMzQ1YQ==
-  data.tar.gz: !binary |-
-    OWU4MWIxODk3NTAzM2VjODA1NDg1MmNlMjZhZWE5MWQ2ZGM3MjcxZg==
-SHA512:
-  metadata.gz: !binary |-
-    MjI1ZjhhNThiNmJhMjBhMmYyMWQ4NDg4MDlmODBmNWZjYzdlMDY4NjlkZDU2
-    NzM5NDFiYzAxZTU4MjM5MmQ5NTA1YjZkMzg2OGZlYzcwODc3ZDk5NzA1OWY0
-    OTZlMTBlMGM1ZTM0NjZmMDk4NDIxMDJjMzVhMTI2ODZmNDA2MzQ=
-  data.tar.gz: !binary |-
-    NzNmY2EzYzczOGY4MTlkZmU5OWFiNTcyNDM5OGIwNmRiZjQxMGYzY2QxMGMw
-    NjRlMGY1YjQ3NjNmOGY4NWMzY2NiMGM0OTA3NmU5OTNhNjYxMjZjZWRiMDRj
-    ZDEyMWU2N2E1YjgzMTllNzY4Nzg1ZWY1MzNmY2JhMjE0OTU3NDc=

data/lib/kitchen/provisioner/ansible_playbook_spec.rb

@@ -1,33 +0,0 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Neill Turner (<neillwturner@gmail.com>)
-#
-# Copyright (C) 2013,2014 Neill Turner
-#
-# 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.
-
-require_relative '../../spec_helper'
-require 'kitchen'
-
-# Work around for lazy loading
-require 'kitchen/provisioner/ansible_playbook'
-
-describe Kitchen::Provisioner::AnsiblePlaybook do
-  let(:provisioner) do
-    Kitchen::Provisioner.for_plugin("ansible_playbook", {})
-  end
-
-  it "should give a sane run_command" do
-    provisioner.run_command.must_match /ansible-playbook/
-  end
-end