From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 7 Sep 2019 15:40:35 +0000 (+0200)
Subject: Nothing cares about the $dbpassword variable we set on handel.  Remove it
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=c61c409283de99571fbc366b114d29154c52b988

Nothing cares about the $dbpassword variable we set on handel.  Remove it
---

diff --git a/.gitignore b/.gitignore
index ed56ebbc9..6e5214a3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@ puppet.conf
 .config-version
 hiera.yaml
 modules/hiera-puppet
-modules/puppetmaster/manifests/db.pp
 modules/exim/files/email-virtualdomains/
 modules/roles/manifests/pubsub/params.pp
 modules/roles/manifests/openstack/params.pp
diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index 9b023abef..6e0ea3193 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -132,10 +132,6 @@ class debian_org {
 			notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
 		}
 	}
-	if $::hostname == handel {
-		include puppetmaster::db
-		$dbpassword = $puppetmaster::db::password
-	}
 	file { '/etc/puppet/puppet.conf':
 		content => template('debian_org/puppet.conf.erb'),
 		mode => '0440',