kitchen-puppet 0.0.31 → 1.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f972d0a87b1def1a969330b08fee33887823ba7
-  data.tar.gz: 536cd0b900f3e927578114c1fd62b1901ffe8df7
+  metadata.gz: af420180c29dc5ff3d167e94b7ed8a3926e939be
+  data.tar.gz: 615e9d379eaecc18518e2bbc2f0cb2c6c1628dc4
 SHA512:
-  metadata.gz: 791e698c2111a21c9afe7c3cd9a2c84c0e97beea6defd4379cdaa241f33db77c0ac1ebe1ad7346907e1abe31e3f051c555a04381dc001cf92ad19cf435dccfa4
-  data.tar.gz: 8620ff75720a0a8264b520b09fbdf71f1d2820719af142667a6744c09040252cda881998c15dc5a5f7bcb1e898a18a6b757168f04fd09f7d230d2d40e9c3abff
+  metadata.gz: 65466da1de6bc81a8ee56c4668745d7fc278f837e6a11604c1af51a9a729377d99b7bf50a264451d3b3b09c74e1fb62273e3600c4ccd6bb563d6a49ee772389d
+  data.tar.gz: 47ae5d2cf0d7211087feca2b10b698557bc36cf2e64e80f3e69d9fb2f8711e21d8c0135fdb998cb86c7a9419512919db5952ed8e36795e413581cfa7dba08f92

data/kitchen-puppet.gemspec

@@ -5,6 +5,7 @@ require 'kitchen-puppet/version'
 
 Gem::Specification.new do |s|
   s.name          = 'kitchen-puppet'
+  s.license       = 'Apache-2.0'
   s.version       = Kitchen::Puppet::VERSION
   s.authors       = ['Neill Turner']
   s.email         = ['neillwturner@gmail.com']

data/lib/kitchen-puppet/version.rb

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

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -32,6 +32,12 @@ module Kitchen
     end
   end
 
+  module Configurable
+    def platform_name(*)
+      instance.platform.name
+    end
+  end
+
   module Provisioner
     #
     # Puppet Apply provisioner.
@@ -46,6 +52,7 @@ module Kitchen
       default_config :puppet_version, nil
       default_config :facter_version, nil
       default_config :hiera_version, nil
+      default_config :install_hiera, false
       default_config :require_puppet_repo, true
       default_config :require_chef_for_busser, true
       default_config :resolve_with_librarian_puppet, true
@@ -125,7 +132,9 @@ module Kitchen
       default_config :puppet_debug, false
       default_config :puppet_verbose, false
       default_config :puppet_noop, false
-      default_config :puppet_platform, ''
+      default_config :platform do |provisioner|
+        provisioner.platform_name('')
+      end
       default_config :update_package_repos, true
       default_config :remove_puppet_repo, false
       default_config :custom_facts, {}
@@ -165,7 +174,7 @@ module Kitchen
         else
           case puppet_platform
           when 'debian', 'ubuntu'
-            info("Installing puppet on #{puppet_platform}")
+            info("Installing puppet on #{config[:platform]}")
             <<-INSTALL
               if [ ! $(which puppet) ]; then
                 #{sudo('apt-get')} -y install wget
@@ -175,7 +184,7 @@ module Kitchen
                 #{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}
+                #{install_hiera}
               fi
               #{install_eyaml}
               #{install_deep_merge}
@@ -210,7 +219,7 @@ module Kitchen
                     #{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}
+                    #{install_hiera}
                   fi
                 fi
               fi
@@ -321,6 +330,13 @@ module Kitchen
         INSTALL
       end
 
+      def install_hiera
+        return unless config[:install_hiera]
+        <<-INSTALL
+          #{sudo_env('apt-get')} -y install hiera-puppet#{puppet_hiera_debian_version}
+        INSTALL
+      end
+
       # /bin/wget -P /etc/pki/rpm-gpg/ http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
       # changed to curl
 
@@ -363,7 +379,7 @@ module Kitchen
       end
 
       def init_command
-        dirs = %w(modules manifests files hiera hiera.yaml)
+        dirs = %w(modules manifests files hiera hiera.yaml spec)
         .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 \
@@ -680,7 +696,7 @@ module Kitchen
       end
 
       def puppet_platform
-        config[:puppet_platform].to_s.downcase
+        config[:platform].gsub(/-.*/, '')
       end
 
       def facter_facts
@@ -744,12 +760,47 @@ module Kitchen
         remove_puppet_repo ? "; #{sudo('rm')} -rf /tmp/kitchen #{hiera_data_remote_path} #{hiera_eyaml_key_remote_path} #{puppet_dir}/* " : nil
       end
 
+      # rubocop:disable Metrics/CyclomaticComplexity
       def puppet_apt_repo
-        config[:puppet_apt_repo]
+        platform_version = config[:platform].partition('-')[2]
+        case puppet_platform
+        when 'ubuntu'
+          case platform_version
+          when '14.10'
+            # Utopic Repo
+            'https://apt.puppetlabs.com/puppetlabs-release-utopic.deb'
+          when '14.04'
+            # Trusty Repo
+            'https://apt.puppetlabs.com/puppetlabs-release-trusty.deb'
+          when '12.04'
+            # Precise Repo
+            'https://apt.puppetlabs.com/puppetlabs-release-precise.deb'
+          else
+            # Configured Repo
+            config[:puppet_apt_repo]
+          end
+        when 'debian'
+          case platform_version.gsub(/\..*/, '')
+          when '8'
+            # Debian Jessie
+            'https://apt.puppetlabs.com/puppetlabs-release-jessie.deb'
+          when '7'
+            # Debian Wheezy
+            'https://apt.puppetlabs.com/puppetlabs-release-wheezy.deb'
+          when '6'
+            # Debian Squeeze
+            'https://apt.puppetlabs.com/puppetlabs-release-squeeze.deb'
+          else
+            # Configured Repo
+            config[:puppet_apt_repo]
+          end
+        else
+          error("Unsupported Platform - #{config[:platform]}")
+        end
       end
 
       def puppet_apt_repo_file
-        config[:puppet_apt_repo].split('/').last
+        puppet_apt_repo.split('/').last
       end
 
       def puppet_apt_coll_repo_file

data/provisioner_options.md

@@ -5,8 +5,9 @@ key | default value | Notes
 ----|---------------|--------
 puppet_version | "latest"| desired version, affects apt installs.
 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.
-puppet_platform | naively tries to determine | OS platform of server
+install_hiera | false | Installs `hiera-puppet` package. Not needed for puppet > 3.x.x
 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
@@ -83,9 +84,9 @@ The provisioner can be configured globally or per suite, global settings act as
   verifier:
     ruby_bindir: '/usr/bin'
 ```
-where /usr/bin is the location of the ruby command. 
+where /usr/bin is the location of the ruby command.
 
-in this example, vagrant will download a box for ubuntu 1204 with no configuration management installed, then install the 
+in this example, vagrant will download a box for ubuntu 1204 with no configuration management installed, then install the
 latest puppet and puppet apply against a puppet repo from the /repository/puppet_repo directory using the defailt manifest site.pp
 
 To override a setting at the suite-level, specify the setting name under the suite:
@@ -202,7 +203,7 @@ The provisioner can be configured globally or per suite, global settings act as
   verifier:
     ruby_bindir: '/usr/bin'
 ```
-where /usr/bin is the location of the ruby command. 
+where /usr/bin is the location of the ruby command.
 
 In this example, vagrant will download a box for ubuntu 1204 with no configuration management installed, then install the latest puppet and run puppet agent against a puppet master at puppetmaster-nocm-ubuntu-1204
 
@@ -221,3 +222,31 @@ To override a setting at the suite-level, specify the setting name under the sui
        provisioner:
          manifest: foobar.pp
 ```
+
+## Custom ServerSpec or Beaker Invocation
+
+ Instead of using the busser use a custom serverspec invocation using [shell verifier](https://github.com/higanworks/kitchen-verifier-shell) to call it.
+With such setup there is no dependency on busser and any other chef library.
+
+Also you can specify you tests in a different directory structure or even call [beaker](https://github.com/puppetlabs/beaker) instead of server spec and have tests in beaker structure
+
+Using a structure like
+```yaml
+verifier:
+  name: shell
+  remote_exec: true
+  command: |
+    sudo -s <<SERVERSPEC
+    cd /opt/gdc/serverspec-core
+    export SERVERSPEC_ENV=$EC2DATA_ENVIRONMENT
+    export SERVERSPEC_BACKEND=exec
+    serverspec junit=true tag=~skip_in_kitchen check:role:$EC2DATA_TYPE
+    SERVERSPEC
+```
+
+where `serverspec` is a wrapper around `rake` invocation.
+Use a `Rakefile` similar to one in https://github.com/vincentbernat/serverspec-example.
+
+With such approach we can achieve flexibility of running same test suite both in test kitchen and actual, even production, instances.
+
+Beware: kitchen-shell-verifier is not yet merged into test-kitchen upstream so using separate gem is unavoidable so far

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 1.0.32
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-22 00:00:00.000000000 Z
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -47,7 +47,8 @@ files:
 - lib/kitchen/provisioner/puppet_apply.rb
 - provisioner_options.md
 homepage: https://github.com/neillturner/kitchen-puppet
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []