2 files changed, 7 insertions, 1 deletions
diff --git a/puppet/modules/site_couchdb/manifests/designs.pp b/puppet/modules/site_couchdb/manifests/designs.pp
index 2d0a8326..83d6c8cd 100644
--- a/puppet/modules/site_couchdb/manifests/designs.pp
+++ b/puppet/modules/site_couchdb/manifests/designs.pp
@@ -7,6 +7,7 @@ class site_couchdb::designs {
     ensure  => directory,
     source  => 'puppet:///modules/site_couchdb/designs',
     recurse => true,
+    purge   => true,
     mode    => '0755'
   }
 
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index fd7e67a1..137b661f 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -50,7 +50,12 @@ class site_couchdb {
     chttpd_bind_address => '127.0.0.1'
   }
 
-  class { 'couchdb::bigcouch::package::cloudant': }
+  # 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']