[MediaWiki-commits] [Gerrit] role::deployment::server: reorganize code - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/249091

Change subject: role::deployment::server: reorganize code
......................................................................

role::deployment::server: reorganize code

Change-Id: Iecbaa257349b013cf62aac5baeca6d2b15db316f
---
M modules/role/manifests/deployment/server.pp
1 file changed, 14 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/249091/1

diff --git a/modules/role/manifests/deployment/server.pp 
b/modules/role/manifests/deployment/server.pp
index dfe5beb..bbfbda2 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -34,16 +34,21 @@
     include ::mediawiki::nutcracker
     include scap::master
 
+    if $::realm != 'labs' {
+        include role::releases::upload
+        include wikitech::wiki::passwords
+        # backup /home dirs on deployment servers
+        include role::backup::host
+        backup::set {'home': }
+    }
+
+    # Firewall rules
     ferm::service { 'rsyncd_scap_master':
         proto   => 'tcp',
         port    => '873',
         srange  => '$MW_APPSERVER_NETWORKS',
     }
 
-    if $::realm != 'labs' {
-        include role::releases::upload
-        include wikitech::wiki::passwords
-    }
 
     $deployable_networks_ferm = join($deployable_networks, ' ')
 
@@ -60,6 +65,7 @@
         ensure => present,
         rule   => 'proto tcp dport ssh saddr $DEPLOYMENT_HOSTS ACCEPT;',
     }
+    ### End firewall rules
 
     #T83854
     ::monitoring::icinga::git_merge { 'mediawiki_config':
@@ -68,6 +74,7 @@
         remote_branch => 'readonly/master'
     }
 
+    ### Trebuchet
     file { '/srv/deployment':
         ensure => directory,
         owner  => 'trebuchet',
@@ -101,23 +108,12 @@
             'ALL = (root) NOPASSWD: /usr/bin/salt-call -l quiet --out=json 
publish.runner deploy.restart *',
         ],
     }
+    ### End Trebuchet
 
-    package { 'percona-toolkit':
-        ensure => latest,
-    }
 
     # tig is a ncurses-based git utility which is useful for
     # determining the state of git repos during deployments.
-    package { 'tig':
-        ensure => latest,
-    }
-
-    if $::realm != 'labs' {
-        # backup /home dirs on deployment servers
-        include role::backup::host
-        backup::set {'home': }
-    }
-
     # jq is a cli program for manipulating json (from api endpoints and such)
-    ensure_packages(['jq'])
+
+    require_package 'percona-toolkit', 'tig', 'jq'
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iecbaa257349b013cf62aac5baeca6d2b15db316f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>

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