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

Add puppet8x support #797

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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 Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -485,11 +485,12 @@ PLATFORMS
ruby

DEPENDENCIES
concurrent-ruby (= 1.1.10)
fast_gettext
kitchen-docker
kitchen-puppet
kitchen-verifier-serverspec
librarian-puppet
librarian-puppet (<= 4.0.1)
mixlib-shellout (~> 2.2.7)
puppet (~> 7.0.0)
puppet-module-posix-default-r2.7
Expand All @@ -500,6 +501,7 @@ DEPENDENCIES
rubocop-i18n (~> 1.2.0)
rubocop-rspec (~> 1.16.0)
ruby-pwsh (~> 0.3.0)
semantic_puppet (= 1.0.4)
test-kitchen (~> 2.5.4)
xmlrpc

Expand Down
4 changes: 1 addition & 3 deletions environments/etc/manifests/site.pp
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
node default {

class { 'datadog_agent':
api_key => 'somenonnullapikeythats32charlong',
agent_extra_options => {
use_http => true,
use_http => true,
},
# Hostname is necessary for Agent to start up properly in container since 7.40.0
# https://github.com/DataDog/datadog-agent/issues/14152#issuecomment-1301842615
Expand All @@ -24,5 +23,4 @@
username => 'status',
password => 'hunter1',
}

}
2 changes: 1 addition & 1 deletion functions/tag6.pp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function datadog_agent::tag6(
) {
if $tag_names =~ Array {
$tags = $tag_names.reduce([]) |$_tags , $tag| {
concat($_tags, datadog_agent::tag6($tag, $lookup_fact, $lookup_table))
concat($_tags, datadog_agent::tag6($tag, $lookup_fact, $lookup_table))
}
} else {
if $lookup_fact =~ String {
Expand Down
Loading