From 31aa020b0fbfe98772c4271d58ee9e4a62a2166e Mon Sep 17 00:00:00 2001 From: Vladimir Kuklin Date: Fri, 2 Nov 2012 17:53:56 +0400 Subject: [PATCH] Avoid duplicate package swift. A duplicate can appear if installed on the same node with openstack::glance with glance_backend=swift, which also installs this package for client utilities and libraries. --- manifests/init.pp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 801b00eb..39a89c4f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -28,9 +28,11 @@ class swift( Class['ssh::server::install'] -> Class['swift'] - package { 'swift': - name => $::swift::params::package_name, - ensure => $package_ensure, + if !defined(Package['swift']) { + package { 'swift': + name => $::swift::params::package_name, + ensure => $package_ensure, + } } package { 'swiftclient':