Bug 1394481 - allow bacula to mdc1 puppet master. r=dividehex

mozilla-releng · Sep 14, 2017 · 522b647 · 522b647
1 parent 4bf7b74
commit 522b647
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/manifests/moco-nodes.pp b/manifests/moco-nodes.pp
@@ -245,7 +245,7 @@
 node 'releng-puppet2.srv.releng.mdc1.mozilla.com' {
     $aspects       = [ 'maximum-security' ]
     $only_user_ssh = true
-    include fw::profiles::puppetmasters
+    include fw::profiles::distinguished_puppetmaster
     include toplevel::server::puppetmaster
     class {
         'bacula_client':

diff --git a/modules/fw/manifests/profiles/distinguished_puppetmaster.pp b/modules/fw/manifests/profiles/distinguished_puppetmaster.pp
@@ -4,9 +4,25 @@
 
 class fw::profiles::distinguished_puppetmaster {
 
-    include ::fw::roles::puppetmaster_from_all_releng
-    include ::fw::roles::puppetmaster_sync_from_all_releng
-    include ::fw::roles::bacula_from_scl3_bacula_host
-    include ::fw::roles::ssh_from_anywhere
-    include ::fw::roles::nrpe_from_nagios
+    case $::fqdn {
+        /.*\.mdc1\.mozilla\.com/: {
+            include ::fw::roles::bacula_from_mdc1_bacula_host
+
+            include ::fw::roles::puppetmaster_from_all_releng
+            include ::fw::roles::puppetmaster_sync_from_all_releng
+            include ::fw::roles::ssh_from_anywhere
+            include ::fw::roles::nrpe_from_nagios
+        }
+        /.*\.scl3\.mozilla\.com/: {
+            include ::fw::roles::bacula_from_scl3_bacula_host
+
+            include ::fw::roles::puppetmaster_from_all_releng
+            include ::fw::roles::puppetmaster_sync_from_all_releng
+            include ::fw::roles::ssh_from_anywhere
+            include ::fw::roles::nrpe_from_nagios
+        }
+        default: {
+            # Silently skip other DCs
+        }
+    }
 }