Skip to content

Add a service provider #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

Closed
ls339 wants to merge 1 commit into from
Closed

Add a service provider #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@
$agent5_repo_uri = $datadog_agent::params::agent5_default_repo,
$agent6_repo_uri = $datadog_agent::params::agent6_default_repo,
$apt_release = $datadog_agent::params::apt_default_release,
$service_provider = 'service',
) inherits datadog_agent::params {

# Allow ports to be passed as integers or strings.
Expand Down Expand Up @@ -392,6 +393,7 @@
location => $agent5_repo_uri,
release => $apt_release,
skip_apt_key_trusting => $skip_apt_key_trusting,
service_provider => $service_provider,
}
} else {
class { 'datadog_agent::ubuntu::agent6':
Expand All @@ -400,23 +402,26 @@
location => $agent6_repo_uri,
release => $apt_release,
skip_apt_key_trusting => $skip_apt_key_trusting,
service_provider => $service_provider,
}
}
}
'RedHat','CentOS','Fedora','Amazon','Scientific' : {
if $agent5_enable {
class { 'datadog_agent::redhat::agent5':
baseurl => $agent5_repo_uri,
manage_repo => $manage_repo,
service_ensure => $service_ensure,
service_enable => $service_enable,
baseurl => $agent5_repo_uri,
manage_repo => $manage_repo,
service_ensure => $service_ensure,
service_enable => $service_enable,
service_provider => $service_provider,
}
} else {
class { 'datadog_agent::redhat::agent6':
baseurl => $agent6_repo_uri,
manage_repo => $manage_repo,
service_ensure => $service_ensure,
service_enable => $service_enable,
baseurl => $agent6_repo_uri,
manage_repo => $manage_repo,
service_ensure => $service_ensure,
service_enable => $service_enable,
service_provider => $service_provider,
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion manifests/redhat/agent5.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Class: datadog_agent::redhat
# Class: datadog_agent::redhat::agent5
#
# This class contains the DataDog agent installation mechanism for Red Hat derivatives
#
Expand All @@ -21,6 +21,7 @@
String $agent_version = 'latest',
String $service_ensure = 'running',
Boolean $service_enable = true,
String $service_provider = 'redhat',
) inherits datadog_agent::params {

validate_legacy('Boolean', 'validate_bool', $manage_repo)
Expand Down Expand Up @@ -95,6 +96,7 @@
hasstatus => false,
pattern => 'dd-agent',
require => Package[$datadog_agent::params::package_name],
provider => $service_provider,
}

}
2 changes: 2 additions & 0 deletions manifests/redhat/agent6.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
String $agent_version = 'latest',
String $service_ensure = 'running',
Boolean $service_enable = true,
String $service_provider = 'redhat',
) inherits datadog_agent::params {

validate_legacy('Boolean', 'validate_bool', $manage_repo)
Expand Down Expand Up @@ -69,6 +70,7 @@
hasstatus => false,
pattern => 'dd-agent',
require => Package[$datadog_agent::params::package_name],
provider => $service_provider,
}

}
4 changes: 3 additions & 1 deletion manifests/ubuntu/agent5.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Class: datadog_agent::ubuntu
# Class: datadog_agent::ubuntu::agent5
#
# This class contains the DataDog agent installation mechanism for Ubuntu
#
Expand All @@ -21,6 +21,7 @@
Boolean $skip_apt_key_trusting = false,
String $service_ensure = 'running',
Boolean $service_enable = true,
String $service_provider = 'ubuntu',
) inherits datadog_agent::params{

ensure_packages(['apt-transport-https'])
Expand Down Expand Up @@ -85,5 +86,6 @@
hasstatus => false,
pattern => 'dd-agent',
require => Package[$datadog_agent::params::package_name],
provider => $service_provider,
}
}
2 changes: 2 additions & 0 deletions manifests/ubuntu/agent6.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
$skip_apt_key_trusting = false,
$service_ensure = 'running',
$service_enable = true,
$service_provider = 'ubuntu',
) inherits datadog_agent::params {

ensure_packages(['apt-transport-https'])
Expand Down Expand Up @@ -51,5 +52,6 @@
hasstatus => false,
pattern => 'dd-agent',
require => Package['datadog-agent'],
provider => $service_provider,
}
}
⚡