Skip to content

Fixes for puppet 8 support #436

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.

Sign up for GitHub

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fixes for puppet 8 support #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc55ff9
Update ruby version fact
atoy40 Jan 7, 2025
9e2a2ca
fixed safe_load arguments
atoy40 Jan 15, 2025
0916e94
Update metadata.json for puppet 8
atoy40 Jan 15, 2025
8f3c5ab
Adapted safe_load arguments to psych version
atoy40 Jan 15, 2025
6819eed
Update verify_host_key options
atoy40 Feb 3, 2025
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: 2 additions & 2 deletions lib/puppet/transport/cisco_ios.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def create_connection
password: config[:password].unwrap,
port: config[:port] || 22,
timeout: config[:timeout] || 30,
verify_host_key => false,
verify_host_key => :never,
user_known_hosts_file: known_hosts_file,
append_all_supported_algorithms: true)
else
Expand All @@ -64,7 +64,7 @@ def create_connection
password: config[:password].unwrap,
port: config[:port] || 22,
timeout: config[:timeout] || 30,
verify_host_key => :very,
verify_host_key => :accept_new,
user_known_hosts_file: known_hosts_file,
append_all_supported_algorithms: true)
end
Expand Down
6 changes: 5 additions & 1 deletion lib/puppet_x/puppetlabs/cisco_ios/utility.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ class Utility
def self.load_yaml(full_path, replace_double_escapes = true)
raise "File #{full_path} doesn't exist." unless File.exist?(full_path)
yaml_file = File.read(full_path)
data_hash = YAML.safe_load(yaml_file, [Symbol])
if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0.pre1")
data_hash = YAML.safe_load(yaml_file, permitted_classes: [Symbol])
else
data_hash = YAML.safe_load(yaml_file, [Symbol])
end
data_hash = replace_double_escapes(data_hash) if replace_double_escapes
data_hash
end
Expand Down
2 changes: 1 addition & 1 deletion manifests/install/agent.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
provider => 'puppet_gem',
}

if versioncmp($facts['rubyversion'], '2.3.0') < 0 {
if versioncmp($facts['ruby']['version'], '2.3.0') < 0 {
package { 'backport_dig':
ensure => present,
provider => 'puppet_gem',
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 6.0.0 < 7.0.0"
"version_requirement": ">= 6.0.0 < 8.0.0"
}
],
"tags": [
Expand Down