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

diff --git a/.gitignore b/.gitignore
index ed56ebb..6e5214a 100644 (file)
--- 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 9b023ab..6e0ea31 100644 (file)
--- 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',