Bug 1361117: install bacula client on ds in mdc1; r=dhouse
authorJake Watkins <jwatkins@mozilla.com>
Thu, 31 Aug 2017 10:09:39 -0700
changeset 5734 0bf4d5516b7ca5418ed5952aa260c5c43303cd52
parent 5732 7667ae03ae94cdf0aba205b8fdc96080d0e6dc87
child 5735 83587ab8e85f0f0e2b98c785710643dddf84c220
child 5736 7d0c4c760a2de8ea4018025117c6e51af41235f3
push id4568
push userjwatkins@mozilla.com
push dateThu, 31 Aug 2017 17:09:43 +0000
reviewersdhouse
bugs1361117
Bug 1361117: install bacula client on ds in mdc1; r=dhouse
manifests/moco-config.pp
manifests/moco-nodes.pp
--- a/manifests/moco-config.pp
+++ b/manifests/moco-config.pp
@@ -469,17 +469,21 @@ class config inherits config::base {
     $bacula_director = $::fqdn? {
         /.*\.mdc1\.mozilla\.com/             => 'bacula1.private.mdc1.mozilla.com',
         /.*\.(scl3|usw2|use1)\.mozilla\.com/ => 'bacula1.private.scl3.mozilla.com',
         default => undef,
     }
 
     $bacula_fd_port                                     = 9102
     # this isn't actually secret, but it's long, so we stick it in hiera.
-    $bacula_cacert                                      = secret('bacula_ca_cert')
+    $bacula_cacert = $::fqdn? {
+        /.*\.mdc1\.mozilla\.com/             => secret('bacula_mdc1_ca_cert'),
+        /.*\.(scl3|usw2|use1)\.mozilla\.com/ => secret('bacula_scl3_ca_cert'),
+        default => undef,
+    }
 
     # Buildbot <-> Taskcluster bridge configuration
     $buildbot_bridge_root                               = '/builds/bbb'
     $buildbot_bridge_tclistener_pulse_exchange_basename = 'exchange/taskcluster-queue/v1'
     $buildbot_bridge_worker_type                        = 'buildbot-bridge'
     $buildbot_bridge_provisioner_id                     = 'buildbot-bridge'
     $buildbot_bridge_bblistener_pulse_exchange          = 'exchange/build'
     $buildbot_bridge_worker_group                       = 'buildbot-bridge'
--- a/manifests/moco-nodes.pp
+++ b/manifests/moco-nodes.pp
@@ -253,21 +253,21 @@ node 'install.test.releng.scl3.mozilla.c
     }
 }
 
 node 'install.test.releng.mdc1.mozilla.com' {
     $aspects = [ 'maximum-security' ]
     $fw_allow_all = true
     include fw::profiles::deploystudio
     include toplevel::server::deploystudio
-    #class {
-    #    'bacula_client':
-    #        cert => secret('install_test_releng_scl3_bacula_cert'),
-    #        key => secret('install_test_releng_scl3_bacula_key');
-    #}
+    class {
+        'bacula_client':
+            cert => secret('install_test_releng_mdc1_bacula_cert'),
+            key  => secret('install_test_releng_mdc1_bacula_key');
+    }
 }
 
 ## Jump hosts
 
 node /rejh\d+\.srv\.releng\.(mdc1|scl3)\.mozilla\.com/ {
     # jump host servers
     $aspects       = [ 'maximum-security' ]
     $timezone      = 'GMT'