Skip to content
This repository has been archived by the owner on Apr 21, 2020. It is now read-only.

Adding optional manage_packages to AWSCW and RSLB packages #50

Open
wants to merge 2 commits into
base: master
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: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ An example of using the AWS Cloudwatch and MySQL plugins with two classes. See t

`regions` - _(optional)_ Array of AWS Cloudwatch regions. e.g. `us-east-1`. Defaults to all available regions

`manage_packages` - _(optional)_ Allow package to manage its own dependencies

####Class

class { 'newrelic_plugins::aws_cloudwatch':
Expand Down Expand Up @@ -326,6 +328,8 @@ For additional info, see https://github.com/newrelic-platform/newrelic_mysql_jav

`version` - _(optional)_ Plugin version. Defaults to latest release version

`manage_packages` - _(optional)_ Allow package to manage its own dependencies

####Class

class { 'newrelic_plugins::rackspace_load_balancers':
Expand Down
11 changes: 8 additions & 3 deletions manifests/aws_cloudwatch.pp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
# provided, the plugin will default to all available
# regions.
#
# $manage_packages:: Allow package to manage its own dependencies
#
# == Requires:
#
# puppetlabs/stdlib
Expand All @@ -53,6 +55,7 @@
$agents,
$version = $newrelic_plugins::params::aws_cloudwatch_version,
$regions = [],
$manage_packages = true
) inherits params {

include stdlib
Expand All @@ -75,9 +78,11 @@
}

# nokogiri packages
package { $newrelic_plugins::params::nokogiri_packages:
ensure => present,
before => Newrelic_plugins::Resource::Install_plugin['newrelic_aws_cloudwatch_plugin'] # for puppet 2.x support
if $manage_packages {
package { $newrelic_plugins::params::nokogiri_packages:
ensure => present,
before => Newrelic_plugins::Resource::Install_plugin['newrelic_aws_cloudwatch_plugin'] # for puppet 2.x support
}
}

$plugin_path = "${install_path}/newrelic_aws_cloudwatch_plugin"
Expand Down
10 changes: 7 additions & 3 deletions manifests/rackspace_load_balancers.pp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
# $region:: Region for Rackspace Load Balancers. Valid regions are:
# 'ord', 'dfw', and 'lon'.
#
# $manage_packages:: Allow package to manage its own dependencies
#
# == Requires:
#
Expand All @@ -48,6 +49,7 @@
$api_key,
$region,
$version = $newrelic_plugins::params::rackspace_load_balancers_version,
$manage_packages = true
) inherits params {

include stdlib
Expand All @@ -69,9 +71,11 @@
}

# nokogiri packages
package { $newrelic_plugins::params::nokogiri_packages:
ensure => present,
before => Newrelic_plugins::Resource::Install_plugin['newrelic_rackspace_load_balancers_plugin'] # for puppet 2.x support
if $manage_packages {
package { $newrelic_plugins::params::nokogiri_packages:
ensure => present,
before => Newrelic_plugins::Resource::Install_plugin['newrelic_rackspace_load_balancers_plugin'] # for puppet 2.x support
}
}

$plugin_path = "${install_path}/newrelic_rackspace_load_balancers_plugin"
Expand Down