kitchen-ansible 0.44.6 → 0.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fbf1e47a7ca285b3ae2dba5f2ae82a112a6f9de
-  data.tar.gz: e0f3f3fd2e1736f45c0ab0735946db1d61f03350
+  metadata.gz: ec676d759c7b80412dd7bce395846610630f2c3f
+  data.tar.gz: b46200840a7879d800dc956710fe7ffa244a9939
 SHA512:
-  metadata.gz: aa72291e7fae7d2e2910344e4b1d08cd08a32c3c9bc31df1e25b03b3a0b094a776c7dca030e2f6560d439a51e44dadf77df1971aa20bd9710c6060fd46afcabe
-  data.tar.gz: be14119c1cc4a5f36cb91a3d2dc005c87df77446440aac3eb6f4e2f731bf9ff8469f1665b6f018dff10c0e238e99d34b98c8d1c7907586a958bea5ae14a32a48
+  metadata.gz: 7338b84eb30b81dc10c962ab8b5922b9314da38f75fac1b3d81742780a6bc7160b23e97289618f620bd91741ac401f8a0d6119169457a04de759449559805079
+  data.tar.gz: fd5abc21918db6188fbc02fb29dba2d13fb22b3225155edbdfd3dd411c5f844feb9e28d1d69b597376a915b5251b841ed9e5eee10bd5fb07b9bb2b25c74c4cf4

data/lib/kitchen-ansible/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 module Kitchen
   module Ansible
-    VERSION = '0.44.6'
+    VERSION = '0.45.0'
   end
 end

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

@@ -39,6 +39,7 @@ module Kitchen
         default_config :require_ansible_repo, true
         default_config :enable_yum_epel, false
         default_config :extra_vars, {}
+        default_config :env_vars, {}
         default_config :tags, []
         default_config :ansible_apt_repo, 'ppa:ansible/ansible'
         default_config :ansible_yum_repo, nil

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

@@ -20,6 +20,7 @@
 require 'json'
 require 'kitchen/provisioner/ansible/os/debian'
 require 'kitchen/provisioner/ansible/os/redhat'
+require 'kitchen/provisioner/ansible/os/fedora'
 require 'kitchen/provisioner/ansible/os/amazon'
 require 'kitchen/provisioner/ansible/os/suse'
 
@@ -40,8 +41,10 @@ module Kitchen
           case platform
           when 'debian', 'ubuntu'
             return Debian.new(platform, config)
-          when 'redhat', 'centos', 'fedora'
+          when 'redhat', 'centos'
             return Redhat.new(platform, config)
+          when 'fedora'
+            return Fedora.new(platform, config)
           when 'amazon'
             return Amazon.new(platform, config)
           when 'suse', 'opensuse', 'sles'

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

@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Michael Heap (<m@michaelheap.com>)
+#          Mark McKinstry
+#
+# 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 Fedora < Os
+          def install_command
+            <<-INSTALL
+
+            if [ ! $(which ansible) ]; then
+            #{redhat_yum_repo}
+            #{update_packages_command}
+            #{sudo_env('dnf')} -y install #{ansible_package_name} libselinux-python git python2-dnf
+            fi
+            INSTALL
+          end
+
+          def update_packages_command
+            @config[:update_package_repos] ? "#{sudo_env('dnf')} makecache" : nil
+          end
+
+          def ansible_package_name
+            if @config[:ansible_version] == 'latest' || @config[:ansible_version] == nil
+              "ansible"
+            else
+              "ansible#{@config[:ansible_version][0..2]}-#{@config[:ansible_version]}"
+            end
+          end
+
+          def redhat_yum_repo
+            if @config[:ansible_yum_repo]
+              <<-INSTALL
+              #{sudo_env('rpm')} -ivh #{@config[:ansible_yum_repo]}
+              INSTALL
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -85,7 +85,9 @@ module Kitchen
             cmd = <<-INSTALL
 
             if [ ! $(which ansible) ]; then
-              if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
+              if [ -f /etc/fedora-release ]; then
+                #{Kitchen::Provisioner::Ansible::Os::Fedora.new('fedora', config).install_command}
+              elif [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
                 if [ -z `grep -q 'Amazon Linux' /etc/system-release` ]; then
                 #{Kitchen::Provisioner::Ansible::Os::Redhat.new('redhat', config).install_command}
                 else
@@ -347,6 +349,7 @@ module Kitchen
             cmd = ansible_command('ansible-playbook')
           end
 
+          cmd = "#{env_vars} #{cmd}" if !config[:env_vars].none?
           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
@@ -554,6 +557,11 @@ module Kitchen
         config[:requirements_path] || nil
       end
 
+      def env_vars
+        return nil if config[:env_vars].none?
+        config[:env_vars].map { |k, v| "#{k}=#{v}" }.join(' ')
+      end
+
       def playbook
         config[:playbook]
       end

data/provisioner_options.md

@@ -52,6 +52,7 @@ ansiblefile_path | | Path to Ansiblefile
 callback_plugins_path | callback_plugins | Ansible repo `callback_plugins` directory
 chef_bootstrap_url | `https://www.getchef.com/chef/install.sh` | The Chef install
 enable_yum_epel | false | Enable the `yum` EPEL repo
+env_vars | Hash.new | Hash to set environment variable to use with `ansible-playbook` command
 extra_vars | Hash.new | Hash to set the `extra_vars` passed to `ansible-playbook` command
 filter_plugins_path | filter_plugins | Ansible repo `filter_plugins` directory
 group_vars_path | group_vars | Ansible repo group_vars directory

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.44.6
+  version: 0.45.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -103,6 +103,7 @@ files:
 - lib/kitchen/provisioner/ansible/os.rb
 - lib/kitchen/provisioner/ansible/os/amazon.rb
 - lib/kitchen/provisioner/ansible/os/debian.rb
+- lib/kitchen/provisioner/ansible/os/fedora.rb
 - lib/kitchen/provisioner/ansible/os/redhat.rb
 - lib/kitchen/provisioner/ansible/os/suse.rb
 - lib/kitchen/provisioner/ansible_playbook.rb