From 2443311119a618e544f0f701c4a596690a3fcd05 Mon Sep 17 00:00:00 2001 From: Micah Date: Thu, 15 Oct 2015 17:12:48 -0400 Subject: switch to ensure_packages to avoid puppet duplicate package definitions (#7530) Change-Id: I398b929fc96cf64e46075266ace0d8d1145b3aac --- puppet/modules/clamav/manifests/unofficial_sigs.pp | 5 +++-- puppet/modules/couchdb | 2 +- puppet/modules/ruby | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'puppet/modules') diff --git a/puppet/modules/clamav/manifests/unofficial_sigs.pp b/puppet/modules/clamav/manifests/unofficial_sigs.pp index 316154d3..2d849585 100644 --- a/puppet/modules/clamav/manifests/unofficial_sigs.pp +++ b/puppet/modules/clamav/manifests/unofficial_sigs.pp @@ -1,10 +1,11 @@ class clamav::unofficial_sigs { - package { [ 'clamav-unofficial-sigs', 'wget', 'gnupg', - 'socat', 'rsync', 'curl' ]: + package { 'clamav-unofficial-sigs': ensure => installed } + ensure_packages(['wget', 'gnupg', 'socat', 'rsync', 'curl']) + file { '/var/log/clamav-unofficial-sigs.log': ensure => file, diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb index ae53b180..d077a7b1 160000 --- a/puppet/modules/couchdb +++ b/puppet/modules/couchdb @@ -1 +1 @@ -Subproject commit ae53b180783016faa4331094a52769ddd57463f8 +Subproject commit d077a7b11c95089882e08432c45b883a9097e81d diff --git a/puppet/modules/ruby b/puppet/modules/ruby index e4de25d7..0fb2b398 160000 --- a/puppet/modules/ruby +++ b/puppet/modules/ruby @@ -1 +1 @@ -Subproject commit e4de25d78eefc7df70a35dee22a3e0dc1b7e1d0b +Subproject commit 0fb2b398dbfce59c678d6f4044a55969e42c6d4d -- cgit v1.2.3