kitchen-ansible 0.0.23 → 0.0.24

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
-module Kitchen
-  module Ansible
-    VERSION = "0.0.23"
-  end
-end
+module Kitchen
+  module Ansible
+    VERSION = "0.0.24"
+  end
+end

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

@@ -1,156 +1,158 @@
-# -*- 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'
-
-module Kitchen
-
-  module Provisioner
-
-    module Ansible
-      #
-      # Ansible Playbook provisioner.
-      #
-      class Config
-        include Kitchen::Configurable
-
-        attr_reader :instance
-
-        default_config :ansible_sudo, true
-        default_config :ansible_verbose, false
-        default_config :require_ansible_omnibus, false
-        default_config :ansible_omnibus_url, nil
-        default_config :ansible_omnibus_remote_path, '/opt/ansible'
-        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 :ansible_sles_repo, "http://download.opensuse.org/repositories/systemsmanagement/SLE_12/systemsmanagement.repo"
-	default_config :python_sles_repo, "http://download.opensuse.org/repositories/devel:/languages:/python/SLE_12/devel:languages:python.repo"
-        default_config :chef_bootstrap_url, "https://www.getchef.com/chef/install.sh"
-        default_config :require_chef_for_busser, false
-        default_config :require_ruby_for_busser, true
-        default_config :requirements_path, false
-        default_config :ansible_verbose, false
-        default_config :ansible_verbosity, 1
-        default_config :ansible_check, false
-        default_config :ansible_diff, false
-        default_config :ansible_platform, ''
-        default_config :ansible_connection, 'local'
-        default_config :update_package_repos, true
-        default_config :require_ansible_source, false
-
-        default_config :playbook do |provisioner|
-          provisioner.calculate_path('default.yml', :file) or
-            raise "No playbook found or specified!  Please either set a playbook in your .kitchen.yml config, or create a default wrapper playbook for your role in test/integration/playbooks/default.yml or test/integration/default.yml"
-        end
-
-        default_config :roles_path do |provisioner|
-          provisioner.calculate_path('roles') or
-            raise 'No roles_path detected. Please specify one in .kitchen.yml'
-        end
-
-        default_config :group_vars_path do |provisioner|
-          provisioner.calculate_path('group_vars', :directory)
-        end
-
-        default_config :additional_copy_path do |provisioner|
-          provisioner.calculate_path('additional_copy', :directory)
-        end
-
-        default_config :host_vars_path do |provisioner|
-          provisioner.calculate_path('host_vars', :directory)
-        end
-
-        default_config :modules_path do |provisioner|
-          provisioner.calculate_path('modules', :directory)
-        end
-
-        default_config :ansiblefile_path do |provisioner|
-          provisioner.calculate_path('Ansiblefile', :file)
-        end
-
-        default_config :filter_plugins_path do |provisioner|
-          provisioner.calculate_path('filter_plugins', :directory)
-        end
-
-        default_config :lookup_plugins_path do |provisioner|
-          provisioner.calculate_path('lookup_plugins', :directory)
-        end
-
-        default_config :ansible_vault_password_file do |provisioner|
-          provisioner.calculate_path('ansible-vault-password', :file)
-        end
-
-        default_config :ansible_inventory_file do |provisioner|
-          provisioner.calculate_path('hosts', :file)
-        end
-
-        def initialize(config = {})
-          init_config(config)
-        end
-
-        def set_instance(instance)
-          @instance = instance
-        end
-
-        def []=(attr, val)
-          config[attr] = val
-        end
-
-        def [](attr)
-          config[attr]
-        end
-
-        def key?(k)
-          return config.key?(k)
-        end
-
-        def keys
-          config.keys
-        end
-
-        def calculate_path(path, type = :directory)
-
-          if not instance
-            raise "Please ensure that an instance is provided before calling calculate_path"
-          end
-
-          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'
-
-          candidates.find do |c|
-            type == :directory ? File.directory?(c) : File.file?(c)
-          end
-        end
-
-
-      end
-
-    end
-  end
-
-end
+# -*- 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'
+
+module Kitchen
+
+  module Provisioner
+
+    module Ansible
+      #
+      # Ansible Playbook provisioner.
+      #
+      class Config
+        include Kitchen::Configurable
+
+        attr_reader :instance
+
+        default_config :ansible_sudo, true
+        default_config :ansible_verbose, false
+        default_config :require_ansible_omnibus, false
+        default_config :ansible_omnibus_url, 'https://raw.githubusercontent.com/neillturner/omnibus-ansible/master/ansible_install.sh'
+        default_config :ansible_omnibus_remote_path, '/opt/ansible'
+        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 :ansible_sles_repo, "http://download.opensuse.org/repositories/systemsmanagement/SLE_12/systemsmanagement.repo"
+	default_config :python_sles_repo, "http://download.opensuse.org/repositories/devel:/languages:/python/SLE_12/devel:languages:python.repo"
+        default_config :chef_bootstrap_url, "https://www.getchef.com/chef/install.sh"
+        # Until we can truly make busser work without /opt/chef/embedded/bin/gem being installed, we still need Chef Omnibus
+        # (Reference: https://github.com/neillturner/kitchen-ansible/issues/66 )
+        default_config :require_chef_for_busser, true
+        default_config :require_ruby_for_busser, false
+        default_config :requirements_path, false
+        default_config :ansible_verbose, false
+        default_config :ansible_verbosity, 1
+        default_config :ansible_check, false
+        default_config :ansible_diff, false
+        default_config :ansible_platform, ''
+        default_config :ansible_connection, 'local'
+        default_config :update_package_repos, true
+        default_config :require_ansible_source, false
+
+        default_config :playbook do |provisioner|
+          provisioner.calculate_path('default.yml', :file) or
+            raise "No playbook found or specified!  Please either set a playbook in your .kitchen.yml config, or create a default wrapper playbook for your role in test/integration/playbooks/default.yml or test/integration/default.yml"
+        end
+
+        default_config :roles_path do |provisioner|
+          provisioner.calculate_path('roles') or
+            raise 'No roles_path detected. Please specify one in .kitchen.yml'
+        end
+
+        default_config :group_vars_path do |provisioner|
+          provisioner.calculate_path('group_vars', :directory)
+        end
+
+        default_config :additional_copy_path do |provisioner|
+          provisioner.calculate_path('additional_copy', :directory)
+        end
+
+        default_config :host_vars_path do |provisioner|
+          provisioner.calculate_path('host_vars', :directory)
+        end
+
+        default_config :modules_path do |provisioner|
+          provisioner.calculate_path('modules', :directory)
+        end
+
+        default_config :ansiblefile_path do |provisioner|
+          provisioner.calculate_path('Ansiblefile', :file)
+        end
+
+        default_config :filter_plugins_path do |provisioner|
+          provisioner.calculate_path('filter_plugins', :directory)
+        end
+
+        default_config :lookup_plugins_path do |provisioner|
+          provisioner.calculate_path('lookup_plugins', :directory)
+        end
+
+        default_config :ansible_vault_password_file do |provisioner|
+          provisioner.calculate_path('ansible-vault-password', :file)
+        end
+
+        default_config :ansible_inventory_file do |provisioner|
+          provisioner.calculate_path('hosts', :file)
+        end
+
+        def initialize(config = {})
+          init_config(config)
+        end
+
+        def set_instance(instance)
+          @instance = instance
+        end
+
+        def []=(attr, val)
+          config[attr] = val
+        end
+
+        def [](attr)
+          config[attr]
+        end
+
+        def key?(k)
+          return config.key?(k)
+        end
+
+        def keys
+          config.keys
+        end
+
+        def calculate_path(path, type = :directory)
+
+          if not instance
+            raise "Please ensure that an instance is provided before calling calculate_path"
+          end
+
+          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'
+
+          candidates.find do |c|
+            type == :directory ? File.directory?(c) : File.file?(c)
+          end
+        end
+
+
+      end
+
+    end
+  end
+
+end

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

@@ -1,83 +1,83 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Fletcher Nichol (<fnichol@nichol.ca>) Neill Turner (<neillwturner@gmail.com>)
-#
-# Copyright (C) 2013, Fletcher Nichol, 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 '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
-
-        include Logging
-
-
-        def initialize(ansiblefile, path, logger = Kitchen.logger)
-          @ansiblefile   = ansiblefile
-          @path       = path
-          @logger     = logger
-        end
-
-        def self.load!(logger = Kitchen.logger)
-          load_librarian!(logger)
-        end
-
-        def resolve
-          version = ::Librarian::Ansible::VERSION
-          info("Resolving role dependencies with Librarian-Ansible #{version}...")
-          debug("Using Ansiblefile from #{ansiblefile}")
-
-          env = ::Librarian::Ansible::Environment.new(
-            :project_path => File.dirname(ansiblefile))
-          env.config_db.local["path"] = path
-          ::Librarian::Action::Resolve.new(env).run
-          ::Librarian::Action::Install.new(env).run
-        end
-
-        attr_reader :ansiblefile, :path, :logger
-
-        def self.load_librarian!(logger)
-          first_load = require 'librarian/ansible'
-          require 'librarian/ansible/environment'
-          require 'librarian/action/resolve'
-          require 'librarian/action/install'
-
-          version = ::Librarian::Ansible::VERSION
-          if first_load
-            logger.debug("Librarian-Ansible #{version} library loaded")
-          else
-            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" +
-            " Gemfile if you are using Bundler: `gem 'librarian-ansible'`.")
-          raise UserError,
-            "Could not load or activate Librarian-Ansible (#{e.message})"
-        end
-      end
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>) Neill Turner (<neillwturner@gmail.com>)
+#
+# Copyright (C) 2013, Fletcher Nichol, 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 '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
+
+        include Logging
+
+
+        def initialize(ansiblefile, path, logger = Kitchen.logger)
+          @ansiblefile   = ansiblefile
+          @path       = path
+          @logger     = logger
+        end
+
+        def self.load!(logger = Kitchen.logger)
+          load_librarian!(logger)
+        end
+
+        def resolve
+          version = ::Librarian::Ansible::VERSION
+          info("Resolving role dependencies with Librarian-Ansible #{version}...")
+          debug("Using Ansiblefile from #{ansiblefile}")
+
+          env = ::Librarian::Ansible::Environment.new(
+            :project_path => File.dirname(ansiblefile))
+          env.config_db.local["path"] = path
+          ::Librarian::Action::Resolve.new(env).run
+          ::Librarian::Action::Install.new(env).run
+        end
+
+        attr_reader :ansiblefile, :path, :logger
+
+        def self.load_librarian!(logger)
+          first_load = require 'librarian/ansible'
+          require 'librarian/ansible/environment'
+          require 'librarian/action/resolve'
+          require 'librarian/action/install'
+
+          version = ::Librarian::Ansible::VERSION
+          if first_load
+            logger.debug("Librarian-Ansible #{version} library loaded")
+          else
+            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" +
+            " Gemfile if you are using Bundler: `gem 'librarian-ansible'`.")
+          raise UserError,
+            "Could not load or activate Librarian-Ansible (#{e.message})"
+        end
+      end
+    end
+  end
+end