diff --git a/manifests/init.pp b/manifests/init.pp index 6b542973..7c1109fd 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -461,7 +461,7 @@ } } } - 'RedHat','CentOS','Fedora','Amazon','Scientific' : { + 'RedHat','CentOS','Fedora','Amazon','Scientific','OracleLinux' : { if $agent5_enable { class { 'datadog_agent::redhat::agent5': baseurl => $agent5_repo_uri, diff --git a/manifests/params.pp b/manifests/params.pp index 08e2f1fb..7d332eda 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -47,7 +47,7 @@ $permissions_protected_file = '0600' $agent_binary = '/opt/datadog-agent/bin/agent/agent' } - 'RedHat','CentOS','Fedora','Amazon','Scientific' : { + 'RedHat','CentOS','Fedora','Amazon','Scientific','OracleLinux' : { $rubydev_package = 'ruby-devel' $agent5_default_repo = "https://yum.datadoghq.com/rpm/${::architecture}/" $agent6_default_repo = "https://yum.datadoghq.com/stable/6/${::architecture}/" diff --git a/metadata.json b/metadata.json index 1b8a8ab3..c500a5e5 100644 --- a/metadata.json +++ b/metadata.json @@ -17,6 +17,10 @@ "operatingsystem": "CentOS", "operatingsystemrelease": ["6", "7"] }, + { + "operatingsystem": "OracleLinux", + "operatingsystemrelease": ["6", "7"] + }, { "operatingsystem": "Scientific", "operatingsystemrelease": ["6", "7"] diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c9717da6..dd8bd262 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -4,7 +4,7 @@ include RspecPuppetFacts DEBIAN_OS = %w(Ubuntu Debian) -REDHAT_OS = %w(RedHat CentOS Fedora Amazon Scientific) +REDHAT_OS = %w(RedHat CentOS Fedora Amazon Scientific OracleLinux) WINDOWS_OS = %w(Windows) if RSpec::Support::OS.windows?