kitchen-puppet 3.0.0 → 3.1.0
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/provisioner/puppet_apply.rb +7 -3
- data/lib/kitchen-puppet/version.rb +1 -1
- data/provisioner_options.md +4 -3
- 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: b10c024f133346c9f00e6ebe0a3b436d0566af02
|
|
4
|
+
data.tar.gz: d870eced29ae1f435b2776ea2ae1a273b2a98433
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c74570be7ec3e2221611758f54fa15ba3ead7f15c08473cfecd5e927e18caa044ae0397779feeefcee85ff4418aac2b53d207906eb39a76bd81736e585b9ac98
|
|
7
|
+
data.tar.gz: 83f1fb83508daa59a920f43a773adf96b30af315d8e0b8d1593535ed4dc4700504a6d5a100a83e7f46098f72361d9b179f8087fc961a604b2ed6e9f8cbde9a94
|
|
@@ -93,7 +93,7 @@ module Kitchen
|
|
|
93
93
|
|
|
94
94
|
default_config :ignored_paths_from_root, ['spec']
|
|
95
95
|
default_config :hiera_data_remote_path, nil
|
|
96
|
-
default_config :manifest, '
|
|
96
|
+
default_config :manifest, ''
|
|
97
97
|
|
|
98
98
|
default_config :manifests_path do |provisioner|
|
|
99
99
|
provisioner.calculate_path('manifests') ||
|
|
@@ -1231,12 +1231,16 @@ module Kitchen
|
|
|
1231
1231
|
facter_dir = File.join(sandbox_path, 'facter')
|
|
1232
1232
|
FileUtils.mkdir_p(facter_dir)
|
|
1233
1233
|
tmp_facter_file = File.join(facter_dir, 'kitchen.rb')
|
|
1234
|
-
facter_facts = Hash[config[:custom_facts]
|
|
1234
|
+
facter_facts = Hash[config[:custom_facts]]
|
|
1235
1235
|
File.open(tmp_facter_file, 'a') do |out|
|
|
1236
1236
|
facter_facts.each do |k, v|
|
|
1237
1237
|
out.write "\nFacter.add(:#{k}) do\n"
|
|
1238
1238
|
out.write " setcode do\n"
|
|
1239
|
-
|
|
1239
|
+
if v.is_a?(Hash)
|
|
1240
|
+
out.write " #{v}\n"
|
|
1241
|
+
else
|
|
1242
|
+
out.write " \"#{v}\"\n"
|
|
1243
|
+
end
|
|
1240
1244
|
out.write " end\n"
|
|
1241
1245
|
out.write "end\n"
|
|
1242
1246
|
end
|
data/provisioner_options.md
CHANGED
|
@@ -19,7 +19,7 @@ It installs it in the following order:
|
|
|
19
19
|
* puppet_apt_collections_repo
|
|
20
20
|
to an new collection. At time of writing there are only 2 collections PC1 and puppet5.
|
|
21
21
|
|
|
22
|
-
* if require_puppet_repo is set to true
|
|
22
|
+
* if require_puppet_repo is set to true
|
|
23
23
|
|
|
24
24
|
Installs from the operation system repository with the puppet version that is in the particular repository.
|
|
25
25
|
|
|
@@ -59,8 +59,8 @@ ignore_spec_fixtures | false | don't copy spec/fixtures to avoid problems with s
|
|
|
59
59
|
install_custom_facts| false | Install custom facts to yaml file at "/tmp/kitchen/facter/kitchen.rb"
|
|
60
60
|
install_hiera | false | Installs `hiera-puppet` package. Not needed for puppet > 3.x.x
|
|
61
61
|
librarian_puppet_ssl_file | nil | ssl certificate file for librarian-puppet
|
|
62
|
-
manifest |
|
|
63
|
-
manifests_path | | puppet repo manifests directory
|
|
62
|
+
manifest | puppet parses every .pp file in the manifests_path directory and its subdirectories | manifest(s) for puppet apply to run. If set to a file like 'site.pp' it will use the file in the mainfests_path.
|
|
63
|
+
manifests_path | 'mainfests' | puppet repo manifests directory
|
|
64
64
|
max_retries| 1 | maximum number of retry attempts of converge command
|
|
65
65
|
modules_path | | puppet repo manifests directory. Can be multiple directories separated by colons and then they will be merged
|
|
66
66
|
no_proxy | nil | list of URLs or IPs that should be excluded from proxying
|
|
@@ -98,6 +98,7 @@ puppet_no_sudo | false | allow puppet command to run without sudo if required
|
|
|
98
98
|
puppet_verbose| false| Extra information logging on puppet run
|
|
99
99
|
puppet_show_diff| false| Show diffs for changes to config files during puppet runs.
|
|
100
100
|
puppet_version | "latest"| desired version, affects apt installs.
|
|
101
|
+
_for windows defaults to_ | 5.0.0 |
|
|
101
102
|
puppet_whitelist_exit_code | nil | Whitelist exit code expected from puppet run. Intended to be used together with `puppet_detailed_exitcodes`. You can also specify a yaml list here (you should use 0 and 2 for `puppet_detailed_exitcodes` to capture puppet runtime errors and allow multiple converge runs (without changes)).
|
|
102
103
|
puppet_yum_repo | "https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm"| yum repo RH/Centos6
|
|
103
104
|
_for RH/Centos7 change to_ | "https://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm" |
|
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: 3.
|
|
4
|
+
version: 3.1.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Neill Turner
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-
|
|
11
|
+
date: 2017-08-06 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: test-kitchen
|