From e91d7e016244da48be0a9ea23d3bb43bb3b8e93d Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 21 Jan 2014 14:41:04 +0100
Subject: properly purge cloudant repository leftovers (#4971)

---
 puppet/modules/site_couchdb/manifests/init.pp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'puppet/modules/site_couchdb/manifests/init.pp')

diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index e1414b34..4cd7ce03 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -49,8 +49,15 @@ class site_couchdb {
     ednp_port       => $ednp_port
   }
 
+  # ensure that we don't have leftovers from previous installations
+  # where we installed the cloudant bigcouch package
+  # https://leap.se/code/issues/4971
+  class { 'couchdb::bigcouch::package::cloudant':
+    ensure => absent
+  }
 
   Class['site_config::default']
+    -> Class['couchdb::bigcouch::package::cloudant']
     -> Service['couchdb']
     -> Class['site_couchdb::stunnel']
     -> File['/root/.netrc']
-- 
cgit v1.2.3