Skip to content

Commit a392a10

Browse files
authored
Merge pull request DataDog#574 from DataDog/albertvaka/oracle-linux
Add support for Oracle Linux
2 parents 3c9d7c6 + f3ae714 commit a392a10

4 files changed

Lines changed: 7 additions & 3 deletions

File tree

manifests/init.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@
461461
}
462462
}
463463
}
464-
'RedHat','CentOS','Fedora','Amazon','Scientific' : {
464+
'RedHat','CentOS','Fedora','Amazon','Scientific','OracleLinux' : {
465465
if $agent5_enable {
466466
class { 'datadog_agent::redhat::agent5':
467467
baseurl => $agent5_repo_uri,

manifests/params.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
$permissions_protected_file = '0600'
4848
$agent_binary = '/opt/datadog-agent/bin/agent/agent'
4949
}
50-
'RedHat','CentOS','Fedora','Amazon','Scientific' : {
50+
'RedHat','CentOS','Fedora','Amazon','Scientific','OracleLinux' : {
5151
$rubydev_package = 'ruby-devel'
5252
$agent5_default_repo = "https://yum.datadoghq.com/rpm/${::architecture}/"
5353
$agent6_default_repo = "https://yum.datadoghq.com/stable/6/${::architecture}/"

metadata.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
"operatingsystem": "CentOS",
1818
"operatingsystemrelease": ["6", "7"]
1919
},
20+
{
21+
"operatingsystem": "OracleLinux",
22+
"operatingsystemrelease": ["6", "7"]
23+
},
2024
{
2125
"operatingsystem": "Scientific",
2226
"operatingsystemrelease": ["6", "7"]

spec/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
include RspecPuppetFacts
55

66
DEBIAN_OS = %w(Ubuntu Debian)
7-
REDHAT_OS = %w(RedHat CentOS Fedora Amazon Scientific)
7+
REDHAT_OS = %w(RedHat CentOS Fedora Amazon Scientific OracleLinux)
88
WINDOWS_OS = %w(Windows)
99

1010
if RSpec::Support::OS.windows?

0 commit comments

Comments
 (0)