summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSwann Croiset <scroiset@mirantis.com>2017-02-13 15:58:32 +0100
committerSwann Croiset <scroiset@mirantis.com>2017-02-13 16:40:24 +0000
commit3cb3a9efdd33fc5900556de547848e1ce7eb0a7f (patch)
tree217bd5b4e6bb9dd37191538f289fce125e7653cd
parent4382e1fd835651ff698edb2765c639408be39e22 (diff)
Force the Puppet Package provider to apt_fuel for collectd package1.0.0
This allows to install unauthenitcated packages. Change-Id: I23014138f5ce29a17dec0819c1d422676190e522 Closes-bug: #1663498
Notes
Notes (review): Code-Review+2: Swann Croiset <scroiset@mirantis.com> Workflow+1: Swann Croiset <scroiset@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 14 Feb 2017 10:21:09 +0000 Reviewed-on: https://review.openstack.org/433177 Project: openstack/fuel-plugin-lma-collector Branch: refs/heads/stable/1.0
-rw-r--r--deployment_scripts/puppet/modules/lma_collector/manifests/collectd/base.pp2
1 files changed, 2 insertions, 0 deletions
diff --git a/deployment_scripts/puppet/modules/lma_collector/manifests/collectd/base.pp b/deployment_scripts/puppet/modules/lma_collector/manifests/collectd/base.pp
index f3e5fa1..415efd7 100644
--- a/deployment_scripts/puppet/modules/lma_collector/manifests/collectd/base.pp
+++ b/deployment_scripts/puppet/modules/lma_collector/manifests/collectd/base.pp
@@ -19,6 +19,7 @@ class lma_collector::collectd::base (
19 $read_threads = $lma_collector::params::collectd_read_threads, 19 $read_threads = $lma_collector::params::collectd_read_threads,
20 $hostname = undef, 20 $hostname = undef,
21 $purge = false, 21 $purge = false,
22 $package_provider = 'apt_fuel',
22) inherits lma_collector::params { 23) inherits lma_collector::params {
23 24
24 include lma_collector::service::metric 25 include lma_collector::service::metric
@@ -49,6 +50,7 @@ class lma_collector::collectd::base (
49 class { '::collectd': 50 class { '::collectd':
50 purge => $purge, 51 purge => $purge,
51 recurse => true, 52 recurse => true,
53 package_provider => $package_provider,
52 purge_config => true, 54 purge_config => true,
53 fqdnlookup => false, 55 fqdnlookup => false,
54 interval => $lma_collector::params::collectd_interval, 56 interval => $lma_collector::params::collectd_interval,