Merge branch 'fordsa' of https://git.adam-barratt.org.uk/git/mirror/dsa-puppet

diff --git a/modules/roles/manifests/buildd_master.pp b/modules/roles/manifests/buildd_master.pp
index 5e0a4a3..a25e85d 100644 (file)
--- a/modules/roles/manifests/buildd_master.pp
+++ b/modules/roles/manifests/buildd_master.pp
@@ -43,7 +43,7 @@ class roles::buildd_master (
   # The UDD database is used to display FTBFS bugs on the web interface
   include roles::udd::db_guest_access
 
-  include roles::postgresql::ftp_master_dak_replica::db_guest_access::bm
+  include roles::postgresql::ftp_master_dak_replica::db_guest_access::ubc
 
   @@postgres::cluster::hba_entry { "qa-buildlogchecks-${::fqdn}":
     tag      => "postgres::cluster::${qa_buildlogchecks_db_port}::hba::${qa_buildlogchecks_db_address}",

diff --git a/modules/roles/manifests/queued_to_ftpmaster.pp b/modules/roles/manifests/queued_to_ftpmaster.pp
index 19a457b..160d983 100644 (file)
--- a/modules/roles/manifests/queued_to_ftpmaster.pp
+++ b/modules/roles/manifests/queued_to_ftpmaster.pp
@@ -3,6 +3,5 @@
 # Hosts that run upload queues (ftp or ssh), for packages destined
 # for ftp-master.
 class roles::queued_to_ftpmaster {
-  include roles::postgresql::ftp_master_dak_replica::db_guest_access::bm
   include roles::postgresql::ftp_master_dak_replica::db_guest_access::ubc
 }