Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade metadata to puppet 8, require Boolean type #72

Merged
merged 7 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ Gemfile:
':development':
- gem: 'puppet-blacksmith'
- gem: 'github_changelog_generator'

- gem: 'rexml'
version: '~> 3.2'
condition: "Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3')"
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ group :development do
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-blacksmith", require: false
gem "github_changelog_generator", require: false
gem "rexml", '~> 3.2', require: false if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3')
end
group :system_tests do
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@
5. [Contributing](#contributing)

## Upgrade warnings:

Upgrading to puppet 8 comes with Ruby 3, which doesn't have the `rexml` gem bundled.
It should be [installed on the puppetserver](https://www.puppet.com/docs/puppet/7/server/gems.html#installing-and-removing-gems).
```
sudo puppetserver gem install rexml
```

Upgrade to version 5.x.x introduced types/providers for network, nwfilter and domains
replacing the execs used before version 5.0.0. To compare the XML's generated with puppet and
the actual running XML's generated with virsh they are sorted which leads to display lots of
Expand Down
2 changes: 2 additions & 0 deletions lib/puppet/type/libvirt_domain.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# frozen_string_literal: true

require 'puppet/parameter/boolean'

Puppet::Type.newtype(:libvirt_domain) do
@doc = 'ensures a persistent domain (vm) (transient domains are ignored)
'
Expand Down
2 changes: 2 additions & 0 deletions lib/puppet/type/libvirt_network.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# frozen_string_literal: true

require 'puppet/parameter/boolean'

Enucatl marked this conversation as resolved.
Show resolved Hide resolved
Puppet::Type.newtype(:libvirt_network) do
@doc = 'ensures a persistent network (transient networks are ignored)
'
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/type/libvirt_nwfilter.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

#
require 'puppet/parameter/boolean'

Enucatl marked this conversation as resolved.
Show resolved Hide resolved
Puppet::Type.newtype(:libvirt_nwfilter) do
@doc = 'ensures a nwfilter
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">=5.0.0 < 8.0.0"
"version_requirement": ">=5.0.0 < 9.0.0"
}
],
"tags": [
Expand Down