-
-
Notifications
You must be signed in to change notification settings - Fork 476
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
stdlib v9 support, use namespaced stdlib functions #1208
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CI failures seems unrelated. Maybe a modulesync update will help in this regard.
metadata.json
Outdated
@@ -22,7 +22,7 @@ | |||
}, | |||
{ | |||
"name": "puppetlabs/stdlib", | |||
"version_requirement": ">= 4.13.0 < 9.0.0" | |||
"version_requirement": ">= 4.13.0 < 10.0.0" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The namespaced version of merge() was added in 04d1f0c5cccb93d0bc928c7623c4b0c0ebda5b6b which require version 9.0.0 of the stdlib module:
"version_requirement": ">= 4.13.0 < 10.0.0" | |
"version_requirement": ">= 9.0.0 < 10.0.0" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated accordingly, thanks
@smortex any updates on this PR? |
Any updates/progress on this? |
manifests/config.pp
Outdated
@@ -164,7 +164,7 @@ | |||
# } | |||
|
|||
# Generate Elasticsearch config | |||
$data = merge( | |||
$data = stdlib::merge( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would really like to release a new version that allow 9.x before we start requiring 9.x
This makes it a bit easier to upgrade without breaking dependencies.
@ggabijaa could you please rebase against voxpupuli:master so that it is ready for merge once the current changes on master is released? |
Rename PR and squash commits to something like 'Use namespaced stdlib functions'? |
manifests/config.pp
Outdated
@@ -21,7 +21,7 @@ | |||
|
|||
$init_defaults = { | |||
'MAX_OPEN_FILES' => '65535', | |||
}.merge($elasticsearch::init_defaults) | |||
}.stdlib::merge($elasticsearch::init_defaults) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you can add the hashes with +
. then you don't need merge and don't need stdlib.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#1217 and just close this PR?
Thanks for your effort on this @ggabijaa. |
Pull Request (PR) description
Added Stdlib v9 support
Added Puppet v8 support
This Pull Request (PR) fixes the following issues
Fixes #1201