Skip to content

Commit 4480b54

Browse files
Bumped minimal Puppet version to 7. Drop support for unsupported operating systems. (#8) (#170)
* Bump pdk version, bump module version. * Update change log * Added change log note.
1 parent f90a697 commit 4480b54

File tree

6 files changed

+97
-12
lines changed

6 files changed

+97
-12
lines changed

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,17 @@
1919
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
22+
/.vendor/
2223
/convert_report.txt
2324
/update_report.txt
2425
.DS_Store
2526
.project
2627
.envrc
2728
/inventory.yaml
2829
/spec/fixtures/litmus_inventory.yaml
30+
.resource_types
31+
.modules
32+
.task_cache.json
33+
.plan_cache.json
34+
.rerun.json
35+
bolt-debug.log

.pdkignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,20 @@
1919
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
22+
/.vendor/
2223
/convert_report.txt
2324
/update_report.txt
2425
.DS_Store
2526
.project
2627
.envrc
2728
/inventory.yaml
2829
/spec/fixtures/litmus_inventory.yaml
30+
.resource_types
31+
.modules
32+
.task_cache.json
33+
.plan_cache.json
34+
.rerun.json
35+
bolt-debug.log
2936
/.fixtures.yml
3037
/Gemfile
3138
/.gitattributes

CHANGELOG.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,43 @@
22

33
All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
44

5+
## [v3.0.0](https://github.com/puppetlabs/puppetlabs-bootstrap/tree/v3.0.0) (2024-10-03)
6+
7+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-bootstrap/compare/v2.1.0...v3.0.0)
8+
9+
**Breaking changes:**
10+
11+
- Bumped minimal Puppet version to 7. Drop support for unsupported operating systems [\#170](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/170) ([benjamin-robertson](https://github.com/benjamin-robertson))
12+
- pdksync - Remove Puppet 5 from testing and bump minimal version to 6.0.0 [\#159](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/159) ([carabasdaniel](https://github.com/carabasdaniel))
13+
14+
**Closed issues:**
15+
16+
- Add the ability to specify puppet.conf options to bootstrap task [\#166](https://github.com/puppetlabs/puppetlabs-bootstrap/issues/166)
17+
- Task fails with no descriptive error if tar isn't installed on target host. [\#156](https://github.com/puppetlabs/puppetlabs-bootstrap/issues/156)
18+
- Specifying extension requests and custom attributes as per README fails with data type validation error [\#80](https://github.com/puppetlabs/puppetlabs-bootstrap/issues/80)
19+
20+
### Added
21+
22+
- Added the ability to set puppet.conf settings via a parameter. [\#167](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/167) ([benjamin-robertson](https://github.com/benjamin-robertson))
23+
- add support clarification notice [\#164](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/164) ([binford2k](https://github.com/binford2k))
24+
- \(docs\) correct install docs link [\#163](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/163) ([binford2k](https://github.com/binford2k))
25+
- \[ISSUE-80\] Update the README to improve the instructions for use of ex… [\#162](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/162) ([nebakke](https://github.com/nebakke))
26+
- pdksync - Remove EL6 testing from Travis [\#158](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/158) ([carabasdaniel](https://github.com/carabasdaniel))
27+
- pdksync - \(IAC-973\) - Update travis/appveyor to run on new default branch main [\#147](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/147) ([david22swan](https://github.com/david22swan))
28+
- pdksync - \(IAC-890\) - Implement CentOS 8 travis tests [\#145](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/145) ([david22swan](https://github.com/david22swan))
29+
- pdksync - Use abs instead of vmpooler to provision test resources [\#144](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/144) ([carabasdaniel](https://github.com/carabasdaniel))
30+
- pdksync - \(maint\) - Pdk Update [\#143](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/143) ([david22swan](https://github.com/david22swan))
31+
- \(maint\) Update CODEOWNERS [\#142](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/142) ([DavidS](https://github.com/DavidS))
32+
- Ensure '$set\_noop' is lowercase for consistency [\#141](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/141) ([zoojar](https://github.com/zoojar))
33+
- pdksync - Add dependency gems to development group [\#140](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/140) ([carabasdaniel](https://github.com/carabasdaniel))
34+
- add set\_noop parameter [\#139](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/139) ([zoojar](https://github.com/zoojar))
35+
- \(MAINT\) Update docker image names [\#136](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/136) ([michaeltlombardi](https://github.com/michaeltlombardi))
36+
- \(IAC-555\) pdksync - Remove distelli-manifest.yml [\#135](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/135) ([david22swan](https://github.com/david22swan))
37+
- pdksync - \(maint\) - Pdk Update [\#134](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/134) ([david22swan](https://github.com/david22swan))
38+
- pdksync - Update weekly scheduled workflows [\#133](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/133) ([carabasdaniel](https://github.com/carabasdaniel))
39+
- pdksync - Add weekly scheduled workflows [\#130](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/130) ([carabasdaniel](https://github.com/carabasdaniel))
40+
- pdksync - \(IAC-215\) - Implement use\_litmus:true [\#129](https://github.com/puppetlabs/puppetlabs-bootstrap/pull/129) ([david22swan](https://github.com/david22swan))
41+
542
## [v2.1.0](https://github.com/puppetlabs/puppetlabs-bootstrap/tree/v2.1.0) (2020-01-21)
643

744
[Full Changelog](https://github.com/puppetlabs/puppetlabs-bootstrap/compare/v2.0.0...v2.1.0)

Gemfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ group :development do
2020
gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2121
gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2222
gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
23-
gem "deep_merge", '~> 1.0', require: false
23+
gem "deep_merge", '~> 1.2.2', require: false
2424
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
25-
gem "facterdb", '~> 1.18', require: false
25+
gem "facterdb", '~> 2.1', require: false
2626
gem "metadata-json-lint", '~> 4.0', require: false
27-
gem "rspec-puppet-facts", '~> 3.0', require: false
27+
gem "rspec-puppet-facts", '~> 4.0', require: false
2828
gem "dependency_checker", '~> 1.0.0', require: false
2929
gem "parallel_tests", '= 3.12.1', require: false
3030
gem "pry", '~> 0.10', require: false
@@ -34,11 +34,13 @@ group :development do
3434
gem "rubocop-performance", '= 1.16.0', require: false
3535
gem "rubocop-rspec", '= 2.19.0', require: false
3636
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
37+
gem "rexml", '>= 3.0.0', '< 3.2.7', require: false
3738
gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
3839
end
3940
group :development, :release_prep do
4041
gem "puppet-strings", '~> 4.0', require: false
41-
gem "puppetlabs_spec_helper", '~> 7.0', require: false
42+
gem "puppetlabs_spec_helper", '~> 8.0', require: false
43+
gem "puppet-blacksmith", '~> 7.0', require: false
4244
end
4345
group :system_tests do
4446
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]

REFERENCE.md

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
# Reference
2+
23
<!-- DO NOT EDIT: This document was generated by Puppet Strings -->
34

45
## Table of Contents
56

6-
**Tasks**
7+
### Tasks
78

89
* [`init`](#init): Bootstrap a node with puppet-agent
910
* [`linux`](#linux): Bootstrap a node with puppet-agent for Linux
1011
* [`windows`](#windows): Bootstrap a node with puppet-agent for Windows
1112

1213
## Tasks
1314

14-
### init
15+
### <a name="init"></a>`init`
1516

1617
Bootstrap a node with puppet-agent
1718

@@ -67,7 +68,13 @@ Data type: `Optional[Array[Pattern[/\w+=\w+/]]]`
6768

6869
This setting is added to puppet.conf and included in the extension_requests section of csr_attributes.yaml
6970

70-
### linux
71+
##### `puppet_conf_settings`
72+
73+
Data type: `Optional[Array[Pattern[/\w+:\w+=.*/]]]`
74+
75+
Puppet conf settings. See https://www.puppet.com/docs/pe/2021.7/installing_nix_and_windows_agents_using_an_install_script.html#customize-install-script for usage instructions
76+
77+
### <a name="linux"></a>`linux`
7178

7279
Bootstrap a node with puppet-agent for Linux
7380

@@ -99,6 +106,12 @@ Data type: `Optional[String]`
99106

100107
The environment in which the node should be bootstrapped
101108

109+
##### `set_noop`
110+
111+
Data type: `Optional[Boolean]`
112+
113+
The noop setting in the [agent] section of puppet.conf
114+
102115
##### `dns_alt_names`
103116

104117
Data type: `Optional[String]`
@@ -117,7 +130,13 @@ Data type: `Optional[Array[Pattern[/\w+=\w+/]]]`
117130

118131
This setting is added to puppet.conf and included in the extension_requests section of csr_attributes.yaml
119132

120-
### windows
133+
##### `puppet_conf_settings`
134+
135+
Data type: `Optional[Array[Pattern[/\w+:\w+=.*/]]]`
136+
137+
Puppet conf settings. See https://www.puppet.com/docs/pe/2021.7/installing_nix_and_windows_agents_using_an_install_script.html#customize-install-script for usage instructions
138+
139+
### <a name="windows"></a>`windows`
121140

122141
Bootstrap a node with puppet-agent for Windows
123142

@@ -149,6 +168,12 @@ Data type: `Optional[String]`
149168

150169
The environment in which the node should be bootstrapped
151170

171+
##### `set_noop`
172+
173+
Data type: `Optional[Boolean]`
174+
175+
The noop setting in the [agent] section of puppet.conf
176+
152177
##### `dns_alt_names`
153178

154179
Data type: `Optional[String]`
@@ -167,3 +192,9 @@ Data type: `Optional[Array[Pattern[/\w+=\w+/]]]`
167192

168193
This setting is added to puppet.conf and included in the extension_requests section of csr_attributes.yaml
169194

195+
##### `puppet_conf_settings`
196+
197+
Data type: `Optional[Array[Pattern[/\w+:\w+=.*/]]]`
198+
199+
Puppet conf settings. See https://www.puppet.com/docs/pe/2021.7/installing_nix_and_windows_agents_using_an_install_script.html#customize-install-script for usage instructions
200+

metadata.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppetlabs-bootstrap",
3-
"version": "2.1.0",
3+
"version": "3.0.0",
44
"author": "puppetlabs",
55
"summary": "Tasks that bootstrap/install Puppet Enterprise agents on Linux and Windows",
66
"license": "Apache-2.0",
@@ -44,7 +44,8 @@
4444
"operatingsystemrelease": [
4545
"18.04",
4646
"20.04",
47-
"22.04"
47+
"22.04",
48+
"24.04"
4849
]
4950
},
5051
{
@@ -70,7 +71,7 @@
7071
"agent",
7172
"install"
7273
],
73-
"pdk-version": "3.0.0",
74+
"pdk-version": "3.3.0",
7475
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
75-
"template-ref": "tags/3.2.0-0-gb257ef1"
76+
"template-ref": "tags/3.3.0.1-0-g6e8b9b0"
7677
}

0 commit comments

Comments
 (0)