kitchen-puppet 0.0.8 → 0.0.9

data/lib/kitchen-puppet/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Puppet
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -55,6 +55,10 @@ module Kitchen
           raise 'No modules_path detected. Please specify one in .kitchen.yml'
       end
 
+      default_config :files_path do |provisioner|
+        provisioner.calculate_path('files')
+      end
+
       default_config :hiera_data_path do |provisioner|
         provisioner.calculate_path('hiera')
       end
@@ -63,6 +67,10 @@ module Kitchen
         provisioner.calculate_path('hiera.yaml', :file)
       end
 
+      default_config :fileserver_config_path do |provisioner|
+        provisioner.calculate_path('fileserver.conf', :file)
+      end
+
       default_config :puppetfile_path do |provisioner|
         provisioner.calculate_path('Puppetfile', :file)
       end
@@ -163,9 +171,9 @@ module Kitchen
           end
 
         def init_command
-          dirs = %w{modules manifests hiera hiera.yaml}.
+          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 /etc/puppet/hiera.yaml;"
+          cmd = "#{sudo('rm')} -rf #{dirs} #{hiera_data_remote_path} /etc/hiera.yaml /etc/puppet/hiera.yaml /etc/puppet/fileserver.conf;"
           cmd = cmd+" mkdir -p #{config[:root_path]}"
           debug(cmd)
           cmd
@@ -179,7 +187,9 @@ module Kitchen
 
           prepare_modules
           prepare_manifests
+          prepare_files
           prepare_hiera_config
+          prepare_fileserver_config
           prepare_hiera_data
           info('Finished Preparing files for transfer')
 
@@ -204,6 +214,14 @@ module Kitchen
             ].join(' ')
           end
 
+          if fileserver_config
+            commands << [
+              sudo('cp'),
+              File.join(config[:root_path], 'fileserver.conf'),
+              '/etc/puppet',
+            ].join(' ')
+          end
+
           if hiera_data and hiera_data_remote_path == '/var/lib/hiera'
             commands << [
               sudo('cp -r'), File.join(config[:root_path], 'hiera'), '/var/lib/'
@@ -232,6 +250,7 @@ module Kitchen
             File.join(config[:root_path], 'manifests', manifest),
             "--modulepath=#{File.join(config[:root_path], 'modules')}",
             "--manifestdir=#{File.join(config[:root_path], 'manifests')}",
+            "--fileserverconfig=#{File.join(config[:root_path], 'fileserver.conf')}",
             puppet_noop_flag,
             puppet_verbose_flag,
             puppet_debug_flag,
@@ -267,10 +286,18 @@ module Kitchen
           config[:modules_path]
         end
 
+        def files
+          config[:files_path]
+        end
+
         def hiera_config
           config[:hiera_config_path]
         end
 
+        def fileserver_config
+          config[:fileserver_config_path]
+        end
+
         def hiera_data
           config[:hiera_data_path]
         end
@@ -344,6 +371,15 @@ module Kitchen
           FileUtils.cp_r(Dir.glob("#{manifests}/*"), tmp_manifests_dir)
         end
 
+        def prepare_files
+          info('Preparing files')
+          debug("Using files from #{files}")
+
+          tmp_files_dir = File.join(sandbox_path, 'files')
+          FileUtils.mkdir_p(tmp_files_dir)
+          FileUtils.cp_r(Dir.glob("#{files}/*"), tmp_files_dir)
+        end
+
         def prepare_modules
           info('Preparing modules')
           if File.exists?(puppetfile)
@@ -366,6 +402,15 @@ module Kitchen
           FileUtils.cp_r(hiera_config, File.join(sandbox_path, 'hiera.yaml'))
         end
 
+        def prepare_fileserver_config
+          return unless fileserver_config
+
+          info('Preparing fileserver')
+          debug("Using fileserver config from #{fileserver_config}")
+
+          FileUtils.cp_r(fileserver_config, File.join(sandbox_path, 'fileserver.conf'))
+        end
+
         def prepare_hiera_data
           return unless hiera_data
           info('Preparing hiera data')

data/provisioner_options.md

@@ -14,6 +14,8 @@ puppet_omnibus_remote_path | "/opt/puppet" | Server Installation location of an
 manifests_path | | puppet repo manifests directory
 manifest | 'site.pp' | manifest for puppet apply to run
 modules_path | | puppet repo manifests directory
+files_path | | directory to place at /tmp/kitchen/files
+fileserver_config_path | | file to place fileserver.conf
 hiera_data_path | | puppet repo hiera data directory
 hiera_data_remote_path | "/var/lib/hiera" | Hiera data directory on server
 puppet_debug| false| Enable full debugging logging

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies: []
 description: ! '== DESCRIPTION: