kitchen-puppet 3.6.0 → 3.7.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 +31 -14
- data/lib/kitchen-puppet/version.rb +1 -1
- data/provisioner_options.md +1 -0
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 369f3fad210da9729f01a2955b6adb88422d3b862afb7492f8dad79cbf9b3004
|
|
4
|
+
data.tar.gz: 94262474ab75182dddb52e5f5ae6d7e956b3bd0f8e4159fec38ff718c9b2dd75
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3eceb0feb4f505ca30193014eb1eb3dbf51dd1d4d54da3b0f544c830731c1f34c6cc93cab493a0b4f6dab91ed58df8a25a7de70d4bd16e6ade7e646f102c563e
|
|
7
|
+
data.tar.gz: eea4d4dc9fee471146f868a062994d98f676873bb7008e9679580f37281426273fe31c5cb3e665fe409dc4815a533cc6c603df0a737c4a9aa805b6c757d5c625
|
|
@@ -72,6 +72,7 @@ module Kitchen
|
|
|
72
72
|
default_config :puppet_apt_repo, 'http://apt.puppetlabs.com/puppetlabs-release-precise.deb'
|
|
73
73
|
default_config :puppet_yum_repo, 'https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm'
|
|
74
74
|
default_config :chef_bootstrap_url, 'https://www.chef.io/chef/install.sh'
|
|
75
|
+
default_config :puppet_windows_msi_url, nil
|
|
75
76
|
default_config :puppet_logdest, nil
|
|
76
77
|
default_config :custom_install_command, nil
|
|
77
78
|
default_config :custom_pre_install_command, nil
|
|
@@ -251,13 +252,19 @@ module Kitchen
|
|
|
251
252
|
<<-INSTALL
|
|
252
253
|
#{custom_pre_install_command}
|
|
253
254
|
if(Get-Command puppet -ErrorAction 0) { return; }
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
255
|
+
if( '#{puppet_windows_msi_url}' -ne '') {
|
|
256
|
+
$MsiUrl = '#{puppet_windows_msi_url}'
|
|
257
|
+
}
|
|
258
|
+
else
|
|
259
|
+
{
|
|
260
|
+
$architecture = if( [Environment]::Is64BitOperatingSystem ) { 'x64' } else { 'x86' }
|
|
261
|
+
if( '#{puppet_windows_version}' -eq 'latest' ) {
|
|
262
|
+
$MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-agent-${architecture}-latest.msi"
|
|
263
|
+
} elseif( '#{puppet_windows_version}' -match '(\\d)\\.' ) {
|
|
264
|
+
$MsiUrl = "https://downloads.puppetlabs.com/windows/puppet$($Matches[1])/puppet-agent-#{puppet_windows_version}-${architecture}.msi"
|
|
265
|
+
} else {
|
|
266
|
+
$MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-#{puppet_windows_version}${architecture}.msi"
|
|
267
|
+
}
|
|
261
268
|
}
|
|
262
269
|
Invoke-WebRequest $MsiUrl -UseBasicParsing -OutFile "C:/puppet.msi" #{posh_proxy_parm}
|
|
263
270
|
$process = Start-Process -FilePath msiexec.exe -Wait -PassThru -ArgumentList '/qn', '/norestart', '/i', 'C:\\puppet.msi'
|
|
@@ -352,13 +359,19 @@ module Kitchen
|
|
|
352
359
|
<<-INSTALL
|
|
353
360
|
#{custom_pre_install_command}
|
|
354
361
|
if(Get-Command puppet -ErrorAction 0) { return; }
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
+
if( '#{puppet_windows_msi_url}' -ne '') {
|
|
363
|
+
$MsiUrl = '#{puppet_windows_msi_url}'
|
|
364
|
+
}
|
|
365
|
+
else
|
|
366
|
+
{
|
|
367
|
+
$architecture = if( [Environment]::Is64BitOperatingSystem ) { 'x64' } else { 'x86' }
|
|
368
|
+
if( '#{puppet_windows_version}' -eq 'latest' ) {
|
|
369
|
+
$MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-agent-${architecture}-latest.msi"
|
|
370
|
+
} elseif( '#{puppet_windows_version}' -match '(\\d)\\.' ) {
|
|
371
|
+
$MsiUrl = "https://downloads.puppetlabs.com/windows/puppet$($Matches[1])/puppet-agent-#{puppet_windows_version}-${architecture}.msi"
|
|
372
|
+
} else {
|
|
373
|
+
$MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-agent-#{puppet_windows_version}-${architecture}.msi"
|
|
374
|
+
}
|
|
362
375
|
}
|
|
363
376
|
Invoke-WebRequest $MsiUrl -UseBasicParsing -OutFile "C:/puppet-agent.msi" #{posh_proxy_parm}
|
|
364
377
|
$process = Start-Process -FilePath msiexec.exe -Wait -PassThru -ArgumentList '/qn', '/norestart', '/i', 'C:\\puppet-agent.msi'
|
|
@@ -975,6 +988,10 @@ module Kitchen
|
|
|
975
988
|
config[:puppet_version] ? config[:puppet_version].to_s : 'latest'
|
|
976
989
|
end
|
|
977
990
|
|
|
991
|
+
def puppet_windows_msi_url
|
|
992
|
+
config[:puppet_windows_msi_url]
|
|
993
|
+
end
|
|
994
|
+
|
|
978
995
|
def puppet_environment_flag
|
|
979
996
|
if config[:puppet_version] =~ /^2/
|
|
980
997
|
config[:puppet_environment] ? "--environment=#{puppet_environment}" : nil
|
data/provisioner_options.md
CHANGED
|
@@ -102,6 +102,7 @@ puppet_verbose| false| Extra information logging on puppet run
|
|
|
102
102
|
puppet_show_diff| false| Show diffs for changes to config files during puppet runs.
|
|
103
103
|
puppet_version | "latest"| desired version, affects apt and most installs.
|
|
104
104
|
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)).
|
|
105
|
+
puppet_windows_msi_url | nil | The MSI to use to install Puppet on Windows, optional but may be needed when you want the latest version of a particular major Puppet release.
|
|
105
106
|
puppet_yum_repo | https://yum.puppetlabs.com/ puppetlabs-release-el-6.noarch.rpm | yum repo RH/Centos6
|
|
106
107
|
_for RH/Centos7 change to_ | https://yum.puppetlabs.com/ puppetlabs-release-el-7.noarch.rpm |
|
|
107
108
|
puppet_yum_collections_repo | https://yum.puppetlabs.com/ puppet5/puppet-release-el-6.noarch.rpm | yum collections repo RH/Centos6
|
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.7.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:
|
|
11
|
+
date: 2023-08-09 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: net-ssh
|