Skip to content

Puppet v4 upgrade #362

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

Closed
bittner wants to merge 2 commits into from
Closed

Puppet v4 upgrade #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bb9407
Bump versions for dependencies
bittner Oct 27, 2017
df2cfcd
Use system_gem instead of puppetserver_gem
bittner Oct 27, 2017
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
2 changes: 1 addition & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
$hiera_tags = false,
$facts_to_tags = [],
$puppet_run_reports = false,
$puppet_gem_provider = 'puppetserver_gem',
$puppet_gem_provider = 'system_gem',
$puppetmaster_user = $settings::user,
$non_local_traffic = false,
$dogstreams = [],
Expand Down
41 changes: 13 additions & 28 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "datadog-datadog_agent",
"version": "1.11.0",
"version": "1.12.0-alpha",
"author": "James Turnbull (<james@lovedthanlost.net>) and Rob Terhaar (<rob@atlanticdynamic>) for Datadog Inc.",
"summary": "Install the Datadog monitoring agent and report Puppet runs to Datadog",
"license": "Apache-2.0",
Expand All @@ -11,46 +11,27 @@
"operatingsystem_support": [
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"6",
"7"
]
"operatingsystemrelease": ["6", "7"]
},
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"6",
"7"
]
"operatingsystemrelease": ["6", "7"]
},
{
"operatingsystem": "Scientific",
"operatingsystemrelease": [
"6",
"7"
]
"operatingsystemrelease": ["6", "7"]
},
{
"operatingsystem": "Fedora",
"operatingsystemrelease": [
"19",
"20"
]
"operatingsystemrelease": ["19", "20", "21", "22", "23", "24", "25", "26"]
},
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"6",
"7"
]
"operatingsystemrelease": ["6", "7", "8", "9"]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"10.04",
"12.04",
"14.04"
]
"operatingsystemrelease": ["10.04", "12.04", "14.04", "16.04", "17.04", "17.10"]
Copy link
Copy Markdown
Member

@truthbk truthbk Nov 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've only officially supported LTS versions thus far - we should probably stay consistent with that (for now)

}
],
"requirements": [
Expand All @@ -70,11 +51,15 @@
},
{
"name": "puppetlabs/ruby",
"version_requirement": ">=0.2.0 <1.0.0"
"version_requirement": ">=0.2.0 <2.0.0"
},
{
"name": "puppetlabs/concat",
"version_requirement": "2.2.0"
"version_requirement": ">=2.2.0 <5.0.0"
},
{
"name": "tkishel/system_gem",
Copy link
Copy Markdown
Member

@truthbk truthbk Nov 23, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This right here is my main concern. See: https://github.com/tkishel/system_gem/blob/master/metadata.json#L24-L28

It's not supported for a bunch of puppet versions we do support, so I guess that's a no-no for now. I understand it addresses an important issue on windows.

"version_requirement": ">=1.0.0 <2.0.0"
},
{
"name": "lwf/remote_file",
Expand Down
⚡