kitchen-puppet 1.37.1 → 1.38.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/kitchen-puppet/version.rb +1 -1
- data/lib/kitchen/provisioner/puppet_apply.rb +10 -1
- data/provisioner_options.md +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b86557b055a6bec703e3cb5dec37119246367b14
|
|
4
|
+
data.tar.gz: e54294a521319c29da7c0217812cbaa1b46737a0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8842936f233daa01810837a9a80a2f713c4dc9080e1f6495cf62d8fe269b557d0255643fbb0c8438812e31d697acce5938ac9e7f2e2295a708ce4fa5a4545fa1
|
|
7
|
+
data.tar.gz: 59f909ccd17e1dd32ec58517040f98d4e577df0d21499c3bf270dddbbc2c8f20f5e6215c366853bf8ca97d24653c95d9941e716d8fa992e4c57b3efc615ff7fb
|
|
@@ -931,7 +931,16 @@ module Kitchen
|
|
|
931
931
|
FileUtils.mkdir_p(tmpmodules_dir)
|
|
932
932
|
resolve_with_librarian if File.exist?(puppetfile) && config[:resolve_with_librarian_puppet]
|
|
933
933
|
|
|
934
|
-
if modules
|
|
934
|
+
if modules.include?(':')
|
|
935
|
+
debug('Found multiple directories in module path merging.....')
|
|
936
|
+
modules_array = modules.split(':')
|
|
937
|
+
modules_array.each do |m|
|
|
938
|
+
if File.directory?(m)
|
|
939
|
+
debug("Copying modules from #{m} to #{tmpmodules_dir}")
|
|
940
|
+
FileUtils.cp_r(Dir.glob("#{m}/*"), tmpmodules_dir, remove_destination: true)
|
|
941
|
+
end
|
|
942
|
+
end
|
|
943
|
+
elsif modules && File.directory?(modules)
|
|
935
944
|
debug("Copying modules from #{modules} to #{tmpmodules_dir}")
|
|
936
945
|
FileUtils.cp_r(Dir.glob("#{modules}/*"), tmpmodules_dir, remove_destination: true)
|
|
937
946
|
else
|
data/provisioner_options.md
CHANGED
|
@@ -23,7 +23,7 @@ puppet_coll_remote_path | "/opt/puppetlabs" | Server Installation location of a
|
|
|
23
23
|
puppet_detailed_exitcodes | nil | Provide transaction information via exit codes. See `--detailed-exitcodes` section of `puppet help apply`
|
|
24
24
|
manifests_path | | puppet repo manifests directory
|
|
25
25
|
manifest | 'site.pp' | manifest for puppet apply to run
|
|
26
|
-
modules_path | | puppet repo manifests directory
|
|
26
|
+
modules_path | | puppet repo manifests directory. Can be multiple directories separated by colons and then they will be merged
|
|
27
27
|
files_path | | directory to place at /tmp/kitchen/files
|
|
28
28
|
fileserver_config_path | | file to place fileserver.conf
|
|
29
29
|
hiera_config_path | | path to hiera.yaml
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kitchen-puppet
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.38.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Neill Turner
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-04-
|
|
11
|
+
date: 2016-04-27 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: test-kitchen
|