Hello RobH, jenkins-bot, Filippo Giunchedi,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "deployment: sync home dirs from mira to naos"
......................................................................

Revert "deployment: sync home dirs from mira to naos"

This reverts commit d91272a19628b4d2e375cd92de8bbe5c69f24ac3.

Change-Id: I450ac26a15d2591e24e6dff171ef045757c81f1c
---
M manifests/site.pp
D modules/role/manifests/deployment/migrate.pp
2 files changed, 1 insertion(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/348892/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 2115734..e0efeb0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2682,17 +2682,8 @@
 }
 
 # deployment servers
-node 'tin.eqiad.wmnet', 'mira.codfw.wmnet' {
+node 'tin.eqiad.wmnet', 'mira.codfw.wmnet', 'naos.codfw.wmnet' {
     role(deployment::server)
-    include ::base::firewall
-
-    interface::add_ip6_mapped { 'main':
-        interface => 'eth0',
-    }
-}
-
-node 'naos.codfw.wmnet' {
-    role(deployment::server, deployment::migrate)
     include ::base::firewall
 
     interface::add_ip6_mapped { 'main':
diff --git a/modules/role/manifests/deployment/migrate.pp 
b/modules/role/manifests/deployment/migrate.pp
deleted file mode 100644
index 559329c..0000000
--- a/modules/role/manifests/deployment/migrate.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-class role::deployment::migrate {
-
-    $sourceip='10.192.16.132'
-
-    ferm::service { 'deployment-migration-rsync':
-        proto  => 'tcp',
-        port   => '873',
-        srange => "${sourceip}/32",
-    }
-
-    include rsync::server
-
-    rsync::server::module { 'deployment-home':
-        path        => '/home',
-        read_only   => 'no',
-        hosts_allow => $sourceip,
-    }
-
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I450ac26a15d2591e24e6dff171ef045757c81f1c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: RobH <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to