[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Move master/slave detection to profile

[Chad (Code Review)]

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/344053 )

Change subject: Gerrit: Move master/slave detection to profile
......................................................................

Gerrit: Move master/slave detection to profile

Allows us to selectively enable/disable ferm & bacula rules if we're
the master or not. The module doesn't need to know what the master is,
just the slave status. So pass that instead

Change-Id: Iad562fd067b56854024153418572c2528e6b51c7
---
M modules/gerrit/manifests/init.pp
M modules/profile/manifests/gerrit/server.pp
2 files changed, 20 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/53/344053/1

diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 167639e..5339aca 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -1,13 +1,8 @@
 # Manifest to setup a Gerrit instance
 class gerrit(
     $host,
-    $master_host = $::fqdn,
+    $slave = false,
 ) {
-
-    $slave = $master_host ? {
-        $::fqdn => false,
-        default => true,
-    }
 
     class { '::gerrit::jetty':
         slave => $slave,
diff --git a/modules/profile/manifests/gerrit/server.pp 
b/modules/profile/manifests/gerrit/server.pp
index e049034..6fa4b88 100644
--- a/modules/profile/manifests/gerrit/server.pp
+++ b/modules/profile/manifests/gerrit/server.pp
@@ -5,7 +5,7 @@
     $ipv4 = hiera('gerrit::server::ipv4'),
     $ipv6 = hiera('gerrit::server::ipv6'),
     $host = hiera('gerrit::server::host'),
-    $master_host = hiera('gerrit::server::master_host'),
+    $master_host = hiera('gerrit::server::master_host', $::fqdn),
     $bacula = hiera('gerrit::server::bacula'),
 ) {
 
@@ -25,6 +25,11 @@
         }
     }
 
+    $slave = $master_host ? {
+        $::fqdn => false,
+        default => true,
+    }
+
     monitoring::service { 'gerrit_ssh':
         description   => 'SSH access',
         check_command => 'check_ssh_port!29418',
@@ -38,22 +43,24 @@
         port  => '29418',
     }
 
-    ferm::service { 'gerrit_http':
-        proto => 'tcp',
-        port  => 'http',
+    if !$slave {
+        ferm::service { 'gerrit_http':
+            proto => 'tcp',
+            port  => 'http',
+        }
+
+        ferm::service { 'gerrit_https':
+            proto => 'tcp',
+            port  => 'https',
+        }
     }
 
-    ferm::service { 'gerrit_https':
-        proto => 'tcp',
-        port  => 'https',
-    }
-
-    if $bacula != undef {
+    if $bacula != undef && !$slave {
         backup::set { $bacula: }
     }
 
     class { '::gerrit':
-        host        => $host,
-        master_host => $master_host,
+        host  => $host,
+        slave => $slave,
     }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/344053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad562fd067b56854024153418572c2528e6b51c7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits