kitchen-puppet 1.0.32 → 1.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af420180c29dc5ff3d167e94b7ed8a3926e939be
-  data.tar.gz: 615e9d379eaecc18518e2bbc2f0cb2c6c1628dc4
+  metadata.gz: f35ff34e5f2d431f879e03f1ef78f663b5cb2035
+  data.tar.gz: 8ec9e89202b63c503cffe34ccc2b9a9f34a0490a
 SHA512:
-  metadata.gz: 65466da1de6bc81a8ee56c4668745d7fc278f837e6a11604c1af51a9a729377d99b7bf50a264451d3b3b09c74e1fb62273e3600c4ccd6bb563d6a49ee772389d
-  data.tar.gz: 47ae5d2cf0d7211087feca2b10b698557bc36cf2e64e80f3e69d9fb2f8711e21d8c0135fdb998cb86c7a9419512919db5952ed8e36795e413581cfa7dba08f92
+  metadata.gz: f19631f93680c0152e4f0a570478eaa63cc49fd450e82e5dfb93673e3351bd05a5f1e73982ef13b2db54848c0b78cf104b5a1a36df0bc40751dc4668f8b78281
+  data.tar.gz: f69ba6210b184cfe83e9d63173e706ee475ec434dabe9509552ce20cc55af86073a9f8f66e3f9356faf90eddd5544600f0bd242a7cf463755d07b0a6470b9a0c

data/README.md

@@ -16,6 +16,41 @@ The PuppetAgent provider works by passing the puppetmaster and other attributes
 
 This provider has been tested against the Ubuntu 1204 and Centos 6.5 boxes running in vagrant/virtualbox as well as various docker .
 
+## Windows Workstation Install
+You need to download the puppet msi and install it and run everything inside the puppet window. 
+
+1. Download and install puppet from the windows msi file from https://downloads.puppetlabs.com/windows
+  * I recommend the using the 32 bit version as not all ruby gems works with the 64 bit version.
+  * Don't do a 'gem install puppet' !!!.
+
+2. Select "Start Command Prompt with Puppet" to go to a Command Window.
+
+3. Install the Ruby DevKit:
+   * Download and install devkit from http://rubyinstaller.org/downloads
+     * (Use a 32 or 64 bit version that matches version of the ruby install)
+   * In the devkit directory run “ruby dk.rb init”.
+   * Edit the config.yml generated and add the the path of the ruby install for puppet
+     * (it will be <install dir of puppet>/sys/ruby).
+   * Run “ruby dk.rb install” to bind it to the puppet ruby installation.
+
+4. From a Command prompt:
+  * gem install librarian-puppet
+  * gem install test-kitchen
+  * gem install kitchen-puppet
+  
+## Mac-OSX Workstation Install
+
+1. Download and install the mac packages from https://downloads.puppetlabs.com/mac/
+  * The most recent Facter package (facter-<VERSION>.dmg)
+  * The most recent Hiera package (hiera-<VERSION>.dmg)
+  * The most recent Puppet package (puppet-<VERSION>.dmg)
+  * See [How to Install Software from DMG Files on a Mac](http://www.ofzenandcomputing.com/how-to-install-dmg-files-mac/) for details.
+
+2. From a Command prompt:
+  * gem install librarian-puppet
+  * gem install test-kitchen
+  * gem install kitchen-puppet
+
 ## 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.
 
@@ -23,9 +58,7 @@ For PuppetAgent a server with a puppet master is required that can resolve the h
 
 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.
-
+## Provisioner Options
 Please see the Provisioner Options (https://github.com/neillturner/kitchen-puppet/blob/master/provisioner_options.md).
 
 ## Contributing

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '1.0.32'
+    VERSION = '1.0.33'
   end
 end

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -33,7 +33,7 @@ module Kitchen
   end
 
   module Configurable
-    def platform_name(*)
+    def platform_name
       instance.platform.name
     end
   end
@@ -53,6 +53,7 @@ module Kitchen
       default_config :facter_version, nil
       default_config :hiera_version, nil
       default_config :install_hiera, false
+      default_config :hiera_package, 'hiera-puppet'
       default_config :require_puppet_repo, true
       default_config :require_chef_for_busser, true
       default_config :resolve_with_librarian_puppet, true
@@ -132,9 +133,7 @@ module Kitchen
       default_config :puppet_debug, false
       default_config :puppet_verbose, false
       default_config :puppet_noop, false
-      default_config :platform do |provisioner|
-        provisioner.platform_name('')
-      end
+      default_config :platform, &:platform_name
       default_config :update_package_repos, true
       default_config :remove_puppet_repo, false
       default_config :custom_facts, {}
@@ -333,10 +332,14 @@ module Kitchen
       def install_hiera
         return unless config[:install_hiera]
         <<-INSTALL
-          #{sudo_env('apt-get')} -y install hiera-puppet#{puppet_hiera_debian_version}
+        #{sudo_env('apt-get')} -y install #{hiera_package}
         INSTALL
       end
 
+      def hiera_package
+        "#{config[:hiera_package]}#{puppet_hiera_debian_version}"
+      end
+
       # /bin/wget -P /etc/pki/rpm-gpg/ http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
       # changed to curl
 

data/provisioner_options.md

@@ -8,12 +8,17 @@ facter_version | "latest"| desired version, affects apt installs.
 platform | platform_name kitchen.yml parameter | OS platform of server
 hiera_version | "latest"| desired version, affects apt installs.
 install_hiera | false | Installs `hiera-puppet` package. Not needed for puppet > 3.x.x
+hiera_package | 'hiera-puppet' | Only used if `install_hiera` is set
 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
-puppet_yum_repo | "https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm"| yum repo
+puppet_apt_repo | "http://apt.puppetlabs.com/puppetlabs-release-precise.deb"| apt repo Ubuntu12
+_for Ubuntu15 change to_ | "http://apt.puppetlabs.com/puppetlabs-release-jessie.deb" | 
+puppet_yum_repo | "https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm"| yum repo RH/Centos6
+_for RH/Centos7 change to_ | "https://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm" | 
 require_puppet_collections | false | Set if using puppet collections install (Puppet v4)
-puppet_yum_collections_repo | "http://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm" | yum collections repo
+puppet_yum_collections_repo | "http://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm" | yum collections repo RH/Centos6
+_for RH/Centos7 change to_ | "https://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm" | 
 puppet_apt_collections_repo | "http://apt.puppetlabs.com/puppetlabs-release-pc1-wheezy.deb" | apt collections repo
+_for Ubuntu15 change to_ | "http://apt.puppetlabs.com/puppetlabs-release-pc1-jessie.deb" | 
 puppet_coll_remote_path | "/opt/puppetlabs" | Server Installation location of a puppet collections install.
 puppet_detailed_exitcodes | nil | Provide transaction information via exit codes.
 manifests_path | | puppet repo manifests directory
@@ -139,7 +144,7 @@ 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
+platform | platform_name kitchen.yml parameter | 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
 puppet_yum_repo | "https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm"| yum repo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 1.0.32
+  version: 1.0.33
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-05 00:00:00.000000000 Z
+date: 2015-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen