kitchen-puppet 0.0.28 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36fd358f7c8da3bc3cd2b237ea8f019073f3dd0d
-  data.tar.gz: 7a46cf27a5c6341575abb77973f0e7f48a0df2b4
+  metadata.gz: 5642be7475bf0630875b90636a565d6900b77ae7
+  data.tar.gz: 5243d5d8468c4ca6ec654b2f58b0ca395dfe986a
 SHA512:
-  metadata.gz: 127466f7d9ce29f275bf2d47f2022b9a31e78bcd7a9f6fb834f6af5f0cf3220f7953655477fda48cd03d84082acc168043a6f95ca157ee07a61a4f650f745ff9
-  data.tar.gz: ce52f4bf834f87126cf2e4b7a81c012d0b7a7eec0b85c408821f701b6a01ea5af516d9c61f5447ee7fa6346700ebee80103718ccf18f8d820941a37d2688dc09
+  metadata.gz: bb5906e46ad8d73d14e3ebf14f08afe42b4ceebb912636cbe8eb7db8a1eb07533bdfa528790e0990a7fa784ef1499592d092257906f6dfd85ffd80ed78ed3a1b
+  data.tar.gz: 1e2730f250b0d5dcd5746aeb18adff0fe627ac4d27c58434fa4ff4a0505a89e842d1aa40c444f33b3ccb3c44a8efd4f50bfb90b75cb1ec268944a4289c2c7150

data/README.md

@@ -14,14 +14,28 @@ The PuppetApply provider works by passing the puppet repository based on attribu
 The PuppetAgent provider works by passing the puppetmaster and other attributes in .kitchen.yml & calling puppet agent.
 
 
-This provider has been tested against the Ubuntu 1204 and Centos 6.5 boxes running in vagrant/virtualbox.
+This provider has been tested against the Ubuntu 1204 and Centos 6.5 boxes running in vagrant/virtualbox as well as various docker .
 
 ## Requirements
 You'll need a driver box without a chef installation so puppet can be installed. Puppet have one at http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box or http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box.
 
-For PuppetAgent a server with a puppet master is required that can resolve the hostname ip address of the server. The server must also be able to resolve the hostname ip address of the puppet master.  
+For PuppetAgent a server with a puppet master is required that can resolve the hostname ip address of the server. The server must also be able to resolve the hostname ip address of the puppet master.
+
+You can also use the PuppetApply driver with a docker container, provided the necessary box requirements to install puppet are included inside the container. The easiest way to do this is to supply Kitchen-Docker with a custom dockerfile to install the needed dependencies for puppet installation.
 
 ## Installation & Setup
-You'll need the test-kitchen & kitchen-puppet gem's installed in your system, along with kitchen-vagrant or some ther suitable driver for test-kitchen. 
+You'll need the test-kitchen & kitchen-puppet gem's installed in your system, along with kitchen-vagrant or some ther suitable driver for test-kitchen.
 
 Please see the Provisioner Options (https://github.com/neillturner/kitchen-puppet/blob/master/provisioner_options.md).
+
+## Contributing
+To contriubute to the repository, please follow the Fork / PR model:
+
+1. Fork The Repository
+2. Work on epic changes
+3. Write tests for your changes
+4. Update Documentation
+5. Commit
+6. Push
+7. Create PR
+8. Profit(?)

data/kitchen-puppet.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.require_paths = ['lib']
   s.rubyforge_project = '[none]'
+  s.add_dependency 'test-kitchen', '~> 1.4'
   s.description = <<-EOF
 == DESCRIPTION:
 

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '0.0.28'
+    VERSION = '0.0.30'
   end
 end

data/lib/kitchen/provisioner/puppet_agent.rb

@@ -43,6 +43,7 @@ module Kitchen
       default_config :puppet_omnibus_url, nil
       default_config :puppet_omnibus_remote_path, '/opt/puppet'
       default_config :puppet_version, nil
+      default_config :facter_version, nil
       default_config :require_puppet_repo, true
       default_config :require_chef_for_busser, true
 
@@ -72,7 +73,7 @@ module Kitchen
       default_config :puppet_test, false
       default_config :puppet_onetime, true
       default_config :puppet_no_daemonize, true
-      default_config :puppet_server, nil   # will default to 'puppet'
+      default_config :puppet_server, nil # will default to 'puppet'
       default_config :puppet_waitforcert, '0'
       default_config :puppet_certname, nil
       default_config :puppet_digest, nil
@@ -120,6 +121,7 @@ module Kitchen
                 #{sudo('wget')} #{wget_proxy_parm} #{puppet_apt_repo}
                 #{sudo('dpkg')} -i #{puppet_apt_repo_file}
                 #{update_packages_debian_cmd}
+                #{sudo_env('apt-get')} -y install facter#{facter_debian_version}
                 #{sudo('apt-get')} -y install puppet-common#{puppet_debian_version}
                 #{sudo('apt-get')} -y install puppet#{puppet_debian_version}
               fi
@@ -153,6 +155,7 @@ module Kitchen
                     #{sudo('wget')} #{wget_proxy_parm} #{puppet_apt_repo}
                     #{sudo('dpkg')} -i #{puppet_apt_repo_file}
                     #{update_packages_debian_cmd}
+                    #{sudo('apt-get')} -y install facter#{facter_debian_version}
                     #{sudo('apt-get')} -y install puppet-common#{puppet_debian_version}
                     #{sudo('apt-get')} -y install puppet#{puppet_debian_version}
                   fi
@@ -255,6 +258,10 @@ module Kitchen
         config[:puppet_version] ? "=#{config[:puppet_version]}" : nil
       end
 
+      def facter_debian_version
+        config[:facter_version] ? "=#{config[:facter_version]}" : nil
+      end
+
       def puppet_redhat_version
         config[:puppet_version] ? "-#{config[:puppet_version]}" : nil
       end

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -22,7 +22,7 @@
 
 require 'uri'
 require 'json'
-require 'kitchen/provisioner/base'
+require 'kitchen'
 require 'kitchen/provisioner/puppet/librarian'
 
 module Kitchen
@@ -44,6 +44,8 @@ module Kitchen
       default_config :puppet_apt_collections_repo, 'http://apt.puppetlabs.com/puppetlabs-release-pc1-wheezy.deb'
       default_config :puppet_coll_remote_path, '/opt/puppetlabs'
       default_config :puppet_version, nil
+      default_config :facter_version, nil
+      default_config :hiera_version, nil
       default_config :require_puppet_repo, true
       default_config :require_chef_for_busser, true
       default_config :resolve_with_librarian_puppet, true
@@ -53,6 +55,7 @@ module Kitchen
       default_config :puppet_yum_repo, 'https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm'
       default_config :chef_bootstrap_url, 'https://www.getchef.com/chef/install.sh'
       default_config :puppet_logdest, nil
+      default_config :custom_install_command, nil
 
       default_config :puppet_apply_command, nil
 
@@ -120,6 +123,7 @@ module Kitchen
       default_config :update_package_repos, true
       default_config :remove_puppet_repo, false
       default_config :custom_facts, {}
+      default_config :facterlib, nil
       default_config :puppet_detailed_exitcodes, nil
       default_config :facter_file, nil
       default_config :librarian_puppet_ssl_file, nil
@@ -162,12 +166,15 @@ module Kitchen
                 #{sudo('wget')} #{wget_proxy_parm} #{puppet_apt_repo}
                 #{sudo('dpkg')} -i #{puppet_apt_repo_file}
                 #{update_packages_debian_cmd}
+                #{sudo_env('apt-get')} -y install facter#{facter_debian_version}
                 #{sudo_env('apt-get')} -y install puppet-common#{puppet_debian_version}
                 #{sudo_env('apt-get')} -y install puppet#{puppet_debian_version}
+                #{sudo_env('apt-get')} -y install hiera-puppet#{puppet_hiera_debian_version}
               fi
               #{install_eyaml}
               #{install_deep_merge}
               #{install_busser}
+              #{custom_install_command}
             INSTALL
           when 'redhat', 'centos', 'fedora', 'oracle', 'amazon'
             info("Installing puppet from yum on #{puppet_platform}")
@@ -178,6 +185,7 @@ module Kitchen
               #{install_eyaml}
               #{install_deep_merge}
               #{install_busser}
+              #{custom_install_command}
             INSTALL
           else
             info('Installing puppet, will try to determine platform os')
@@ -193,14 +201,17 @@ module Kitchen
                     #{sudo('wget')} #{wget_proxy_parm} #{puppet_apt_repo}
                     #{sudo('dpkg')} -i #{puppet_apt_repo_file}
                     #{update_packages_debian_cmd}
+                    #{sudo_env('apt-get')} -y install facter#{facter_debian_version}
                     #{sudo_env('apt-get')} -y install puppet-common#{puppet_debian_version}
                     #{sudo_env('apt-get')} -y install puppet#{puppet_debian_version}
+                    #{sudo_env('apt-get')} -y install hiera-puppet#{puppet_hiera_debian_version}
                   fi
                 fi
               fi
               #{install_eyaml}
               #{install_deep_merge}
               #{install_busser}
+              #{custom_install_command}
             INSTALL
           end
         end
@@ -214,6 +225,7 @@ module Kitchen
           #{sudo('apt-get')} -y install wget
           #{sudo('wget')} #{wget_proxy_parm} #{config[:puppet_apt_collections_repo]}
           #{sudo('dpkg')} -i #{puppet_apt_coll_repo_file}
+          #{custom_install_command}
           INSTALL
         when 'redhat', 'centos', 'fedora', 'oracle', 'amazon'
           info("Installing Puppet Collections on #{puppet_platform}")
@@ -227,6 +239,7 @@ module Kitchen
           #{install_eyaml("#{config[:puppet_coll_remote_path]}/puppet/bin/gem")}
           #{install_deep_merge}
           #{install_busser}
+          #{custom_install_command}
           INSTALL
         else
           info('Installing Puppet Collections, will try to determine platform os')
@@ -257,6 +270,7 @@ module Kitchen
             #{install_eyaml("#{config[:puppet_coll_remote_path]}/puppet/bin/gem")}
             #{install_deep_merge}
             #{install_busser}
+            #{custom_install_command}
           INSTALL
         end
       end
@@ -336,12 +350,18 @@ module Kitchen
         INSTALL
       end
 
+      def custom_install_command
+        <<-INSTALL
+          #{config[:custom_install_command]}
+        INSTALL
+      end
+
       def init_command
         dirs = %w(modules manifests files hiera hiera.yaml)
         .map { |dir| File.join(config[:root_path], dir) }.join(' ')
         cmd = "#{sudo('rm')} -rf #{dirs} #{hiera_data_remote_path} /etc/hiera.yaml #{puppet_dir}/hiera.yaml #{puppet_dir}/fileserver.conf;"
         cmd += config[:puppet_environment] ? "#{sudo('rm')} -f #{File.join(puppet_dir, config[:puppet_environment])};" : ''
-        cmd += " mkdir -p #{config[:root_path]} #{puppet_dir}"
+        cmd += " mkdir -p #{config[:root_path]}; #{sudo('mkdir')} -p #{puppet_dir}"
         debug(cmd)
         cmd
       end
@@ -447,7 +467,7 @@ module Kitchen
 
         if puppet_environment
           commands << [
-            sudo('ln -s '),  config[:root_path], File.join(puppet_dir, config[:puppet_environment])
+            sudo('ln -s '), config[:root_path], File.join(puppet_dir, config[:puppet_environment])
           ].join(' ')
         end
 
@@ -462,6 +482,7 @@ module Kitchen
           return config[:puppet_apply_command]
         else
           [
+            facterlib,
             custom_facts,
             facter_facts,
             puppet_cmd,
@@ -594,12 +615,24 @@ module Kitchen
         config[:puppet_version] ? "=#{config[:puppet_version]}" : nil
       end
 
+      def facter_debian_version
+        config[:facter_version] ? "=#{config[:facter_version]}" : nil
+      end
+
+      def puppet_hiera_debian_version
+        config[:hiera_version] ? "=#{config[:hiera_version]}" : nil
+      end
+
       def puppet_redhat_version
         config[:puppet_version] ? "-#{config[:puppet_version]}" : nil
       end
 
       def puppet_environment_flag
-        config[:puppet_environment] ? "--environment=#{config[:puppet_environment]} --environmentpath=#{puppet_dir}" : nil
+        if config[:puppet_version] =~ /^2/
+          config[:puppet_environment] ? "--environment=#{config[:puppet_environment]}" : nil
+        else
+          config[:puppet_environment] ? "--environment=#{config[:puppet_environment]} --environmentpath=#{puppet_dir}" : nil
+        end
       end
 
       def puppet_manifestdir
@@ -661,6 +694,13 @@ module Kitchen
         config[:remove_puppet_repo]
       end
 
+      def facterlib
+        return nil if config[:facterlib].nil?
+        bash_vars = "export FACTERLIB='#{config[:facterlib]}';"
+        debug(bash_vars)
+        bash_vars
+      end
+
       def custom_facts
         return nil if config[:custom_facts].none?
         bash_vars = config[:custom_facts].map { |k, v| "FACTER_#{k}=#{v}" }.join(' ')

data/provisioner_options.md

@@ -4,6 +4,8 @@
 key | default value | Notes
 ----|---------------|--------
 puppet_version | "latest"| desired version, affects apt installs.
+facter_version | "latest"| desired version, affects apt installs.
+hiera_version | "latest"| desired version, affects apt installs.
 puppet_platform | naively tries to determine | OS platform of server
 require_puppet_repo | true | Set if using a puppet install from yum or apt repo
 puppet_apt_repo | "http://apt.puppetlabs.com/puppetlabs-release-precise.deb"| apt repo
@@ -46,6 +48,7 @@ facter_file | nil | yaml file of custom facter_files to be provided to the puppe
 http_proxy | nil | use http proxy when installing puppet, packages and running puppet
 https_proxy | nil | use https proxy when installing puppet, packages and running puppet
 puppet_logdest | nil | _Array_ of log destinations. Include 'console' if wanted
+custom_install_command | nil | Custom shell command to be used at install stage. Can be multiline. See examples below.
 
 
 ## Puppet Apply Configuring Provisioner Options
@@ -90,8 +93,29 @@ To override a setting at the suite-level, specify the setting name under the sui
 ```yaml
     suites:
      - name: default
-       manifest: foobar.pp
+       provisioner:
+         manifest: foobar.pp
 ```
+
+#### custom_install_command example usage
+
+* One liner
+```yaml
+    custom_install_command: yum install -y git
+```
+* Multiple lines, a.k.a embed shell script
+```yaml
+  custom_install_command: |
+     command1
+     command2
+```
+* Multiple lines join without new line
+```yaml
+  custom_install_command: >
+     command1 &&
+     command2
+```
+
 ### Per-suite Structure
 
 It can be beneficial to keep different Puppet layouts for different suites. Rather than having to specify the manifest, modules, etc for each suite, you can create the following directory structure and they will automatically be found:
@@ -113,6 +137,7 @@ no idea why Puppet versioned their repository with a trailing
 key | default value | Notes
 ----|---------------|--------
 puppet_version | "latest"| desired version, affects apt installs.
+facter_version | "latest"| desired version, affects apt installs.
 puppet_platform | naively tries to determine | OS platform of server
 require_puppet_repo | true | Set if using a puppet install from yum or apt repo
 puppet_apt_repo | "http://apt.puppetlabs.com/puppetlabs-release-precise.deb"| apt repo
@@ -135,6 +160,7 @@ puppet_verbose| false| Extra information logging on puppet run
 puppet_noop| false| puppet runs in a no-op or dry-run mode
 update_package_repos| true| update OS repository metadata
 custom_facts| Hash.new | Hash to set the puppet facts before running puppet apply
+facterlib | nil | Path for dynamic fact generation, e.g. /etc/puppet/facter . See https://docs.puppetlabs.com/facter/2.2/custom_facts.html
 chef_bootstrap_url |"https://www.getchef.com/chef/install.sh"| the chef (needed for busser to run tests)
 puppet_agent_command | nil | Overwrite the puppet agent command. Needs "sudo -E puppet agent" as a prefix.
 require_chef_for_busser | true | Install chef as currently needed by busser to run tests. NOTE: kitchen 1.4 only requires ruby to run busser so this is not required.
@@ -192,5 +218,6 @@ To override a setting at the suite-level, specify the setting name under the sui
 ```yaml
     suites:
      - name: default
-       manifest: foobar.pp
+       provisioner:
+         manifest: foobar.pp
 ```

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.30
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-16 00:00:00.000000000 Z
-dependencies: []
+date: 2015-08-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: test-kitchen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: |+
   == DESCRIPTION:
 
@@ -31,7 +45,6 @@ files:
 - lib/kitchen/provisioner/puppet/librarian.rb
 - lib/kitchen/provisioner/puppet_agent.rb
 - lib/kitchen/provisioner/puppet_apply.rb
-- lib/kitchen/provisioner/puppet_apply_spec.rb
 - provisioner_options.md
 homepage: https://github.com/neillturner/kitchen-puppet
 licenses: []

data/lib/kitchen/provisioner/puppet_apply_spec.rb

@@ -1,33 +0,0 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Chris Lundquist (<chris.lundquist@github.com>) Neill Turner (<neillwturner@gmail.com>)
-#
-# Copyright (C) 2013,2014 Chris Lundquist, 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/puppet_apply'
-
-describe Kitchen::Provisioner::PuppetApply do
-  let(:provisioner) do
-    Kitchen::Provisioner.for_plugin('puppet_apply', {})
-  end
-
-  it 'should give a sane run_command' do
-    provisioner.run_command.must_match 'puppet apply'
-  end
-end