kitchen-ansible 0.0.33 → 0.0.34

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

@@ -20,19 +20,14 @@ require 'kitchen/errors'
 require 'kitchen/logging'
 
 module Kitchen
-
   module Provisioner
-
     module Ansible
-
       # Ansible module resolver that uses Librarian-Ansible and a Ansiblefile to
       # calculate # dependencies.
       #
-       class Librarian
-
+      class Librarian
         include Logging
 
-
         def initialize(ansiblefile, path, logger = Kitchen.logger)
           @ansiblefile   = ansiblefile
           @path       = path
@@ -49,8 +44,8 @@ module Kitchen
           debug("Using Ansiblefile from #{ansiblefile}")
 
           env = ::Librarian::Ansible::Environment.new(
-            :project_path => File.dirname(ansiblefile))
-          env.config_db.local["path"] = path
+            project_path: File.dirname(ansiblefile))
+          env.config_db.local['path'] = path
           ::Librarian::Action::Resolve.new(env).run
           ::Librarian::Action::Install.new(env).run
         end
@@ -70,12 +65,12 @@ module Kitchen
             logger.debug("Librarian-Ansible #{version} previously loaded")
           end
         rescue LoadError => e
-          logger.fatal("The `librarian-ansible' gem is missing and must be installed" +
-            " or cannot be properly activated. Run" +
-            " `gem install librarian-ansible` or add the following to your" +
+          logger.fatal("The `librarian-ansible' gem is missing and must be installed" \
+            ' or cannot be properly activated. Run' \
+            ' `gem install librarian-ansible` or add the following to your' \
             " Gemfile if you are using Bundler: `gem 'librarian-ansible'`.")
           raise UserError,
-            "Could not load or activate Librarian-Ansible (#{e.message})"
+                "Could not load or activate Librarian-Ansible (#{e.message})"
         end
       end
     end

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

@@ -0,0 +1,69 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Michael Heap (<m@michaelheap.com>)
+#
+# Copyright (C) 2015 Michael Heap
+#
+# 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 'json'
+require 'kitchen/provisioner/ansible/os/debian'
+require 'kitchen/provisioner/ansible/os/redhat'
+require 'kitchen/provisioner/ansible/os/amazon'
+require 'kitchen/provisioner/ansible/os/suse'
+
+module Kitchen
+  module Provisioner
+    module Ansible
+      class Os
+        attr_accessor :name
+
+        def initialize(name, config)
+          @config = config
+          @name = name
+        end
+
+        def self.make(platform, config)
+          return nil if platform == ''
+
+          case platform
+          when 'debian', 'ubuntu'
+            return Debian.new(platform, config)
+          when 'redhat', 'centos', 'fedora'
+            return Redhat.new(platform, config)
+          when 'amazon'
+            return Amazon.new(platform, config)
+          when 'suse', 'opensuse', 'sles'
+            return Suse.new(platform, config)
+          end
+
+          nil
+        end
+
+        # Helpers
+        def sudo_env(pm)
+          s = @config[:https_proxy] ? "https_proxy=#{@config[:https_proxy]}" : nil
+          p = @config[:http_proxy] ? "http_proxy=#{@config[:http_proxy]}" : nil
+          n = @config[:no_proxy] ? "no_proxy=#{@config[:no_proxy]}" : nil
+          p || s ? "#{sudo('env')} #{p} #{s} #{n} #{pm}" : "#{sudo(pm)}"
+        end
+
+        # Taken from https://github.com/test-kitchen/test-kitchen/blob/master/lib/kitchen/provisioner/base.rb
+        def sudo(script)
+          @config[:sudo] ? "#{@config[:sudo_command]} #{script}" : script
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Michael Heap (<m@michaelheap.com>)
+#
+# Copyright (C) 2015 Michael Heap
+#
+# 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 Amazon < Redhat
+          def install_command
+            <<-INSTALL
+            if [ ! $(which ansible) ]; then
+              #{install_epel_repo}
+              #{sudo_env('yum-config-manager')} --enable epel/x86_64
+              #{sudo_env('yum')} -y install ansible#{ansible_redhat_version} git
+              #{sudo_env('alternatives')} --set python /usr/bin/python2.6
+              #{sudo_env('yum')} clean all
+              #{sudo_env('yum')} install yum-python26 -y
+            fi
+            INSTALL
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Michael Heap (<m@michaelheap.com>)
+#
+# Copyright (C) 2015 Michael Heap
+#
+# 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 Debian < Os
+          def update_packages_command
+            @config[:update_package_repos] ? "#{sudo_env('apt-get')} update" : nil
+          end
+
+          def install_command
+            <<-INSTALL
+            if [ ! $(which ansible) ]; then
+              #{update_packages_command}
+
+              ## Install apt-utils to silence debconf warning: http://serverfault.com/q/358943/77156
+              #{sudo_env('apt-get')} -y install apt-utils git
+
+              ## Fix debconf tty warning messages
+              export DEBIAN_FRONTEND=noninteractive
+
+              ## 13.10, 14.04 include add-apt-repository in software-properties-common
+              #{sudo_env('apt-get')} -y install software-properties-common
+
+              ## 10.04, 12.04 include add-apt-repository in
+              #{sudo_env('apt-get')} -y install python-software-properties
+
+              ## 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_env('add-apt-repository')} -y #{@config[:ansible_apt_repo]} || #{sudo_env('add-apt-repository')} #{@config[:ansible_apt_repo]}
+              #{sudo_env('apt-get')} update
+              #{sudo_env('apt-get')} -y install ansible
+            fi
+            INSTALL
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,68 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Michael Heap (<m@michaelheap.com>)
+#
+# Copyright (C) 2015 Michael Heap
+#
+# 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 Redhat < Os
+          def install_command
+            <<-INSTALL
+            if [ ! $(which ansible) ]; then
+            #{install_epel_repo}
+            #{redhat_yum_repo}
+            #{update_packages_command}
+            #{sudo_env('yum')} -y install ansible#{ansible_redhat_version} libselinux-python git
+            fi
+            INSTALL
+          end
+
+          def update_packages_command
+            @config[:update_package_repos] ? "#{sudo_env('yum')} makecache" : nil
+          end
+
+          def install_epel_repo
+            @config[:enable_yum_epel] ? sudo_env('yum install epel-release -y') : nil
+          end
+
+          def ansible_redhat_version
+            @config[:ansible_version] ? "-#{@config[:ansible_version]}" : nil
+          end
+
+          def redhat_yum_repo
+            if @config[:ansible_yum_repo] == 'https://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm'
+              <<-INSTALL
+              rhelversion6=$(cat /etc/redhat-release | grep 'release 6')
+              if [ -n "$rhelversion6" ]; then
+                #{sudo_env('rpm')} -ivh 'https://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm'
+              else
+                #{sudo_env('rpm')} -ivh 'http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm'
+              fi
+              INSTALL
+            else
+              <<-INSTALL
+              #{sudo_env('rpm')} -ivh #{@config[:ansible_yum_repo]}
+              INSTALL
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Michael Heap (<m@michaelheap.com>)
+#
+# Copyright (C) 2015 Michael Heap
+#
+# 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 Suse < Os
+          def install_command
+            <<-INSTALL
+            if [ ! $(which ansible) ]; then
+              #{sudo_env('zypper')} ar #{@config[:python_sles_repo]}
+              #{sudo_env('zypper')} ar #{@config[:ansible_sles_repo]}
+              #{update_packages_command}
+              #{sudo_env('zypper')} --non-interactive install ansible
+            fi
+            INSTALL
+          end
+
+          def update_packages_command
+            @config[:update_package_repos] ? "#{sudo_env('zypper')} --gpg-auto-import-keys ref" : nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -23,14 +23,13 @@
 require 'json'
 require 'kitchen/provisioner/base'
 require 'kitchen/provisioner/ansible/config'
+require 'kitchen/provisioner/ansible/os'
 require 'kitchen/provisioner/ansible/librarian'
 
 module Kitchen
-
   class Busser
-
     def non_suite_dirs
-      %w{data}
+      %w(data)
     end
   end
 
@@ -44,24 +43,26 @@ module Kitchen
       def initialize(provisioner_config)
         config = Kitchen::Provisioner::Ansible::Config.new(provisioner_config)
         super(config)
+
+        @os = Kitchen::Provisioner::Ansible::Os.make(ansible_platform, config)
       end
 
       def finalize_config!(instance)
-        config.set_instance(instance)
+        config.instance = instance
         super(instance)
       end
 
       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
+        log_levels = { info: 1, warn: 2, debug: 3, trace: 4 }
+        if level.is_a?(Symbol) && log_levels.include?(level)
           # puts "Log Level is: #{log_levels[level]}"
           log_levels[level]
-        elsif level.is_a? Integer and level > 0
+        elsif level.is_a?(Integer) && 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'
+          fail 'Invalid ansible_verbosity setting.  Valid values are: 1, 2, 3, 4 OR :info, :warn, :debug, :trace'
         end
       end
 
@@ -69,36 +70,26 @@ module Kitchen
         if config[:require_ansible_omnibus]
           cmd = install_omnibus_command
         elsif config[:require_ansible_source]
-          info("Installing ansible from source")
+          info('Installing ansible from source')
           cmd = install_ansible_from_source_command
         elsif config[:require_ansible_repo]
-          case ansible_platform
-          when "debian", "ubuntu"
-            info("Installing ansible on #{ansible_platform}")
-            cmd = install_debian_command
-          when "redhat", "centos", "fedora"
-            info("Installing ansible on #{ansible_platform}")
-            cmd = install_redhat_command
-          when "amazon"
-            info("Installing ansible on #{ansible_platform}")
-            cmd = install_amazon_linux_command
-          when "suse", "opensuse", "sles"
-            info("Installing ansible on #{ansible_platform}")
-            cmd = install_suse_command
+          if !@os.nil?
+            info("Installing ansible on #{@os.name}")
+            cmd =  @os.install_command
           else
-            info("Installing ansible, will try to determine platform os")
+            info('Installing ansible, will try to determine platform os')
             cmd = <<-INSTALL
             if [ ! $(which ansible) ]; then
               if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
                 if ! [ grep -q 'Amazon Linux' /etc/system-release ]; then
-                  #{install_redhat_command}
+                #{Kitchen::Provisioner::Ansible::Os::Redhat.new('redhat', config).install_command}
                 else
-                  #{install_amazon_linux_command}
+                #{Kitchen::Provisioner::Ansible::Os::Amazon.new('amazon', config).install_command}
                 fi
               elif [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]; then
-                #{install_suse_command}
+                #{Kitchen::Provisioner::Ansible::Os::Suse.new('suse', config).install_command}
               else
-                #{install_debian_command}
+                #{Kitchen::Provisioner::Ansible::Os::Debian.new('debian', config).install_command}
               fi
             fi
             INSTALL
@@ -125,20 +116,21 @@ module Kitchen
           install << <<-INSTALL
             if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
             if ! [ grep -q 'Amazon Linux' /etc/system-release ]; then
-            rhelversion=$(cat /etc/redhat-release | grep 'release 6')
-            # For CentOS6/RHEL6 install ruby from SCL
-            if [ -n "$rhelversion" ]; then
-            if [ ! -d "/opt/rh/ruby193" ]; then
-              echo "-----> Installing ruby SCL in CentOS6/RHEL6 to install busser to run tests"
-              #{sudo_env('yum')} install -y centos-release-SCL
-              #{sudo_env('yum')} install -y ruby193
-              #{sudo_env('yum')} install -y ruby193-ruby-devel
-              echo "-----> Enabling ruby193"
-              source /opt/rh/ruby193/enable
-              echo "/opt/rh/ruby193/root/usr/lib64" | sudo tee -a /etc/ld.so.conf
+            rhelversion6=$(cat /etc/redhat-release | grep 'release 6')
+            rhelversion7=$(cat /etc/redhat-release | grep 'release 7')
+            # For CentOS6/CentOS7/RHEL6/RHEL7 install ruby from SCL
+            if [ -n "$rhelversion6" ] || [ -n "$rhelversion7" ]; then
+            if [ ! -d "/opt/rh/ruby200" ]; then
+              echo "-----> Installing ruby200 SCL in CentOS6/CentOS7/RHEL6/RHEL7 to install busser to run tests"
+              #{sudo_env('yum')} install -y centos-release-scl
+              #{sudo_env('yum')} install -y ruby200
+              #{sudo_env('yum')} install -y ruby200-ruby-devel
+              echo "-----> Enabling ruby200"
+              source /opt/rh/ruby200/enable
+              echo "/opt/rh/ruby200/root/usr/lib64" | sudo tee -a /etc/ld.so.conf
               #{sudo_env('ldconfig')}
-              #{sudo_env('ln')} -s /opt/rh/ruby193/root/usr/bin/ruby /usr/bin/ruby
-              #{sudo_env('ln')} -s /opt/rh/ruby193/root/usr/bin/gem /usr/bin/gem
+              #{sudo_env('ln')} -sf /opt/rh/ruby200/root/usr/bin/ruby /usr/bin/ruby
+              #{sudo_env('ln')} -sf /opt/rh/ruby200/root/usr/bin/gem /usr/bin/gem
             fi
             else
               if [ ! $(which ruby) ]; then
@@ -183,7 +175,7 @@ module Kitchen
            fi
            INSTALL
 
-        elsif require_chef_for_busser && chef_url then
+        elsif require_chef_for_busser && chef_url
           install << <<-INSTALL
             # install chef omnibus so that busser works as this is needed to run tests :(
             if [ ! -d "/opt/chef" ]
@@ -200,10 +192,10 @@ module Kitchen
       end
 
       def init_command
-        dirs = %w{modules roles group_vars host_vars}.
-          map { |dir| File.join(config[:root_path], dir) }.join(" ")
+        dirs = %w(modules roles group_vars host_vars)
+               .map { |dir| File.join(config[:root_path], dir) }.join(' ')
         cmd = "#{sudo_env('rm')} -rf #{dirs};"
-        cmd = cmd+" mkdir -p #{config[:root_path]}"
+        cmd += " mkdir -p #{config[:root_path]}"
         debug(cmd)
         cmd
       end
@@ -230,7 +222,6 @@ module Kitchen
         prepare_lookup_plugins
         prepare_ansible_vault_password_file
         info('Finished Preparing files for transfer')
-
       end
 
       def cleanup_sandbox
@@ -244,19 +235,19 @@ module Kitchen
 
         # Prevent failure when ansible package installation doesn't contain /etc/ansible
         commands << [
-            sudo_env("bash -c '[ -d /etc/ansible ] || mkdir /etc/ansible'")
+          sudo_env("bash -c '[ -d /etc/ansible ] || mkdir /etc/ansible'")
         ]
 
         commands << [
-            sudo_env('cp'),File.join(config[:root_path], 'ansible.cfg'),'/etc/ansible',
+          sudo_env('cp'), File.join(config[:root_path], 'ansible.cfg'), '/etc/ansible'
         ].join(' ')
 
         commands << [
-            sudo_env('cp -r'), File.join(config[:root_path],'group_vars'), '/etc/ansible/.',
+          sudo_env('cp -r'), File.join(config[:root_path], 'group_vars'), '/etc/ansible/.'
         ].join(' ')
 
         commands << [
-            sudo_env('cp -r'), File.join(config[:root_path],'host_vars'), '/etc/ansible/.',
+          sudo_env('cp -r'), File.join(config[:root_path], 'host_vars'), '/etc/ansible/.'
         ].join(' ')
 
         if galaxy_requirements
@@ -264,9 +255,9 @@ module Kitchen
             commands << setup_ansible_env_from_source
           end
           commands << [
-             'ansible-galaxy', 'install', '--force',
-             '-p', File.join(config[:root_path], 'roles'),
-             '-r', File.join(config[:root_path], galaxy_requirements),
+            'ansible-galaxy', 'install', '--force',
+            '-p', File.join(config[:root_path], 'roles'),
+            '-r', File.join(config[:root_path], galaxy_requirements)
           ].join(' ')
         end
 
@@ -279,24 +270,25 @@ module Kitchen
         if !config[:ansible_playbook_command].nil?
           return config[:ansible_playbook_command]
         else
+
+          cmd = ansible_command('ansible-playbook')
           if config[:require_ansible_source]
             # this is an ugly hack to get around the fact that extra vars uses ' and "
             cmd = ansible_command("PATH=#{config[:root_path]}/ansible/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games PYTHONPATH=#{config[:root_path]}/ansible/lib MANPATH=#{config[:root_path]}/ansible/docs/man #{config[:root_path]}/ansible/bin/ansible-playbook")
-          else
-            cmd = ansible_command("ansible-playbook")
           end
+
           if config[:ansible_binary_path]
             cmd = ansible_command("#{config[:ansible_binary_path]}/ansible-playbook")
           end
-          if https_proxy
-            cmd = "HTTPS_PROXY=#{https_proxy} #{cmd}"
-          end
-          if http_proxy
-            cmd = "HTTP_PROXY=#{http_proxy} #{cmd}"
-          end
-          if ansible_roles_path
-            cmd = "ANSIBLE_ROLES_PATH=#{ansible_roles_path} #{cmd}"
-          end
+
+          cmd = "HTTPS_PROXY=#{https_proxy} #{cmd}" if https_proxy
+          cmd = "HTTP_PROXY=#{http_proxy} #{cmd}" if http_proxy
+          cmd = "NO_PROXY=#{no_proxy} #{cmd}" if no_proxy
+          cmd = "ANSIBLE_ROLES_PATH=#{ansible_roles_path} #{cmd}" if ansible_roles_path
+          cmd = "ANSIBLE_HOST_KEY_CHECKING=false #{cmd}" if !ansible_host_key_checking
+
+          cmd = "#{cd_ansible} #{cmd}" if !config[:ansible_sudo].nil? && !config[:ansible_sudo]
+          cmd = "chmod 400 #{private_key_file}; #{cmd}" if config[:private_key] && config[:set_private_key_permissions]
 
           result = [
             cmd,
@@ -307,27 +299,46 @@ module Kitchen
             ansible_check_flag,
             ansible_diff_flag,
             ansible_vault_flag,
+            private_key,
             extra_vars,
             tags,
             ansible_extra_flags,
-            "#{File.join(config[:root_path], File.basename(config[:playbook]))}",
-          ].join(" ")
+            "#{File.join(config[:root_path], File.basename(config[:playbook]))}"
+          ].join(' ')
           info("Going to invoke ansible-playbook with: #{result}")
+          if config[:idempotency_test]
+            result = "#{result} && echo 'Going to invoke ansible-playbook second time:'; #{result} | tee /tmp/idempotency_test.txt; grep -q 'changed=0.*failed=0' /tmp/idempotency_test.txt && (echo 'Idempotence test: PASS' && exit 0) || (echo 'Idempotence test: FAIL' && exit 1)"
+            debug("Full cmd with idempotency test: #{result}")
+          end
+
           result
         end
       end
 
       def ansible_command(script)
-        config[:ansible_sudo].nil? || config[:ansible_sudo] == true ? sudo_env(script) : script
+        if config[:ansible_sudo].nil? || config[:ansible_sudo] == true
+          s = https_proxy ? "https_proxy=#{https_proxy}" : nil
+          p = http_proxy ? "http_proxy=#{http_proxy}" : nil
+          n = no_proxy ? "no_proxy=#{no_proxy}" : nil
+          p || s || n ? " #{p} #{s} #{n} sudo -Es #{cd_ansible} #{script}" : "sudo -Es #{cd_ansible} #{script}"
+        else
+          return script
+        end
+      end
+
+      def cd_ansible
+       # this is not working so just return nil for now
+       # File.exist?('ansible.cfg') ? "cd #{config[:root_path]};" : nil
+       nil
       end
 
       protected
 
       def load_needed_dependencies!
-        if File.exists?(ansiblefile)
-          debug("Ansiblefile found at #{ansiblefile}, loading Librarian-Ansible")
-          Ansible::Librarian.load!(logger)
-        end
+        return unless File.exist?(ansiblefile)
+
+        debug("Ansiblefile found at #{ansiblefile}, loading Librarian-Ansible")
+        Ansible::Librarian.load!(logger)
       end
 
       def install_ansible_from_source_command
@@ -357,12 +368,10 @@ module Kitchen
       end
 
       def install_omnibus_command
-        info("Installing ansible using ansible omnibus")
-        version = if !config[:ansible_version].nil?
-          "-v #{config[:ansible_version]}"
-        else
-          ""
-        end
+        info('Installing ansible using ansible omnibus')
+
+        version = ''
+        version = "-v #{config[:ansible_version]}" unless config[:ansible_version].nil?
 
         <<-INSTALL
         #{Util.shell_helpers}
@@ -377,69 +386,6 @@ module Kitchen
         INSTALL
       end
 
-      def install_debian_command
-        <<-INSTALL
-        if [ ! $(which ansible) ]; then
-          #{update_packages_debian_cmd}
-
-          ## Install apt-utils to silence debconf warning: http://serverfault.com/q/358943/77156
-          #{sudo_env('apt-get')} -y install apt-utils git
-
-          ## Fix debconf tty warning messages
-          export DEBIAN_FRONTEND=noninteractive
-
-          ## 13.10, 14.04 include add-apt-repository in software-properties-common
-          #{sudo_env('apt-get')} -y install software-properties-common
-
-          ## 10.04, 12.04 include add-apt-repository in
-          #{sudo_env('apt-get')} -y install python-software-properties
-
-          ## 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_env('add-apt-repository')} -y #{ansible_apt_repo} || #{sudo_env('add-apt-repository')} #{ansible_apt_repo}
-          #{sudo_env('apt-get')} update
-          #{sudo_env('apt-get')} -y install ansible
-        fi
-        INSTALL
-      end
-
-      def install_suse_command
-        <<-INSTALL
-        if [ ! $(which ansible) ]; then
-          #{sudo_env('zypper')} ar #{python_sles_repo}
-          #{sudo_env('zypper')} ar #{ansible_sles_repo}
-          #{update_packages_suse_cmd}
-          #{sudo_env('zypper')} --non-interactive install ansible
-        fi
-        INSTALL
-      end
-
-      def install_redhat_command
-        <<-INSTALL
-        if [ ! $(which ansible) ]; then
-          #{install_epel_repo}
-          #{sudo_env('rpm')} -ivh #{ansible_yum_repo}
-          #{update_packages_redhat_cmd}
-          #{sudo_env('yum')} -y install ansible#{ansible_redhat_version} libselinux-python git
-        fi
-        INSTALL
-      end
-
-      def install_amazon_linux_command
-        <<-INSTALL
-        if [ ! $(which ansible) ]; then
-          #{install_epel_repo}
-          #{sudo_env('yum-config-manager')} --enable epel/x86_64
-          #{sudo_env('yum')} -y install ansible#{ansible_redhat_version} git
-          #{sudo_env('alternatives')} --set python /usr/bin/python2.6
-          #{sudo_env('yum')} clean all
-          #{sudo_env('yum')} install yum-python26 -y
-        fi
-        INSTALL
-      end
-
       def setup_ansible_env_from_source
         "cd #{config[:root_path]}/ansible && source hacking/env-setup && cd ../"
       end
@@ -560,10 +506,6 @@ module Kitchen
         config[:ansible_version] ? "=#{config[:ansible_version]}" : nil
       end
 
-      def ansible_redhat_version
-        config[:ansible_version] ? "-#{config[:ansible_version]}" : nil
-      end
-
       def ansible_verbose_flag
         config[:ansible_verbose] ? '-' << ('v' * verbosity_level(config[:ansible_verbosity])) : nil
       end
@@ -582,7 +524,7 @@ module Kitchen
       end
 
       def ansible_inventory_flag
-          config[:ansible_inventory_file] ? "--inventory-file=#{File.join(config[:root_path], File.basename(config[:ansible_inventory_file]))}" : "--inventory-file=#{File.join(config[:root_path], 'hosts')}"
+        config[:ansible_inventory_file] ? "--inventory-file=#{File.join(config[:root_path], File.basename(config[:ansible_inventory_file]))}" : "--inventory-file=#{File.join(config[:root_path], 'hosts')}"
       end
 
       def ansible_extra_flags
@@ -593,16 +535,34 @@ module Kitchen
         config[:ansible_platform].to_s.downcase
       end
 
+      def ansible_host_key_checking
+        config[:ansible_host_key_checking]
+      end
+
+      def private_key
+        if config[:private_key]
+          "--private-key #{private_key_file}"
+        end
+      end
+
+      def private_key_file
+        if config[:private_key].start_with?('/') || config[:private_key].start_with?('~')
+          "#{config[:private_key]}"
+        elsif config[:private_key]
+          "#{File.join(config[:root_path], config[:private_key])}"
+        end
+      end
+
       def update_packages_debian_cmd
-        config[:update_package_repos] ? "#{sudo_env('apt-get')} update" : nil
+        Kitchen::Provisioner::Ansible::Os::Debian.new('debian', config).update_packages_command
       end
 
       def update_packages_suse_cmd
-        config[:update_package_repos] ? "#{sudo_env('zypper')} --gpg-auto-import-keys ref" : nil
+        Kitchen::Provisioner::Ansible::Os::Suse.new('suse', config).update_packages_command
       end
 
       def update_packages_redhat_cmd
-        config[:update_package_repos] ? "#{sudo_env('yum')} makecache" : nil
+        Kitchen::Provisioner::Ansible::Os::Redhat.new('redhat', config).update_packages_command
       end
 
       def extra_vars
@@ -622,32 +582,12 @@ module Kitchen
         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 = bash_tags.join(',')
         bash_tags = "-t '#{bash_tags}'"
         debug(bash_tags)
         bash_tags
       end
 
-      def ansible_apt_repo
-        config[:ansible_apt_repo]
-      end
-
-      def ansible_apt_repo_file
-        config[:ansible_apt_repo].split('/').last
-      end
-
-      def ansible_yum_repo
-        config[:ansible_yum_repo]
-      end
-
-      def ansible_sles_repo
-        config[:ansible_sles_repo]
-      end
-
-      def python_sles_repo
-        config[:python_sles_repo]
-      end
-
       def chef_url
         config[:chef_bootstrap_url]
       end
@@ -660,10 +600,6 @@ module Kitchen
         config[:require_chef_for_busser]
       end
 
-      def install_epel_repo
-        config[:enable_yum_epel] ? sudo_env('yum install epel-release -y') : nil
-      end
-
       def install_source_rev
         config[:ansible_source_rev] ? "--branch #{config[:ansible_source_rev]}" : nil
       end
@@ -684,15 +620,15 @@ module Kitchen
         s = https_proxy ? "https_proxy=#{https_proxy}" : nil
         p = http_proxy ? "http_proxy=#{http_proxy}" : nil
         n = no_proxy ? "no_proxy=#{no_proxy}" : nil
-        p || s ? "#{sudo('env')} #{p} #{s} #{n} #{pm}" : "#{sudo(pm)}"
+        p || s || n ? "#{sudo('env')} #{p} #{s} #{n} #{pm}" : "#{sudo(pm)}"
       end
 
       def export_http_proxy
-        cmd = ""
+        cmd = ''
         cmd = " HTTP_PROXY=#{http_proxy}" if http_proxy
         cmd = "#{cmd} HTTPS_PROXY=#{https_proxy}" if https_proxy
         cmd = "#{cmd} NO_PROXY=#{no_proxy}" if no_proxy
-        cmd = "export #{cmd}" if cmd != ""
+        cmd = "export #{cmd}" if cmd != ''
         cmd
       end
 
@@ -715,7 +651,7 @@ module Kitchen
         info('Preparing roles')
         debug("Using roles from #{roles}")
 
-        resolve_with_librarian if File.exists?(ansiblefile)
+        resolve_with_librarian if File.exist?(ansiblefile)
 
         if galaxy_requirements
           FileUtils.cp(galaxy_requirements, File.join(sandbox_path, galaxy_requirements))
@@ -733,12 +669,12 @@ module Kitchen
         info('Preparing ansible.cfg file')
         ansible_config_file = "#{File.join(sandbox_path, 'ansible.cfg')}"
         if File.exist?('ansible.cfg')
-           info("Found existing ansible.cfg")
-           FileUtils.cp_r('ansible.cfg', ansible_config_file)
+          info('Found existing ansible.cfg')
+          FileUtils.cp_r('ansible.cfg', ansible_config_file)
         else
           info('Empty ansible.cfg generated')
-          File.open(ansible_config_file, "wb") do |file|
-             file.write("#no config parameters\n")
+          File.open(ansible_config_file, 'wb') do |file|
+            file.write("#no config parameters\n")
           end
         end
       end
@@ -746,10 +682,9 @@ module Kitchen
       def prepare_inventory_file
         info('Preparing inventory file')
 
-        if ansible_inventory_file
-            debug("Copying inventory file from #{ansible_inventory_file} to #{tmp_inventory_file_path}")
-            FileUtils.cp_r(ansible_inventory_file, tmp_inventory_file_path)
-        end
+        return unless ansible_inventory_file
+        debug("Copying inventory file from #{ansible_inventory_file} to #{tmp_inventory_file_path}")
+        FileUtils.cp_r(ansible_inventory_file, tmp_inventory_file_path)
       end
 
       # localhost ansible_connection=local
@@ -760,11 +695,11 @@ module Kitchen
         info('Preparing hosts file')
 
         if config[:hosts].nil?
-          raise 'No hosts have been set. Please specify one in .kitchen.yml'
+          fail 'No hosts have been set. Please specify one in .kitchen.yml'
         else
           debug("Using host from #{hosts}")
-          File.open(File.join(sandbox_path, "hosts"), "wb") do |file|
-             file.write("localhost ansible_connection=local\n[#{hosts}]\nlocalhost\n")
+          File.open(File.join(sandbox_path, 'hosts'), 'wb') do |file|
+            file.write("localhost ansible_connection=local\n[#{hosts}]\nlocalhost\n")
           end
         end
       end
@@ -805,10 +740,10 @@ module Kitchen
 
       def additional_files
         additional_files = []
-        if ( additional_copy )
-          additional_files = additional_copy.kind_of?(Array) ? additional_copy : [additional_copy]
+        if  additional_copy
+          additional_files = additional_copy.is_a?(Array) ? additional_copy : [additional_copy]
         end
-        additional_files.map { |additional_dir | additional_dir.to_s }
+        additional_files.map(&:to_s)
       end
 
       def prepare_host_vars
@@ -899,12 +834,12 @@ module Kitchen
       end
 
       def prepare_ansible_vault_password_file
-        if ansible_vault_password_file
-          info('Preparing ansible vault password')
-          debug("Copying ansible vault password file from #{ansible_vault_password_file} to #{tmp_ansible_vault_password_file_path}")
+        return unless ansible_vault_password_file
 
-          FileUtils.cp(ansible_vault_password_file, tmp_ansible_vault_password_file_path)
-        end
+        info('Preparing ansible vault password')
+        debug("Copying ansible vault password file from #{ansible_vault_password_file} to #{tmp_ansible_vault_password_file_path}")
+
+        FileUtils.cp(ansible_vault_password_file, tmp_ansible_vault_password_file_path)
       end
 
       def resolve_with_librarian