Rush has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338973 )

Change subject: labstore: 1001 and 1002 are currently idle
......................................................................


labstore: 1001 and 1002 are currently idle

Change-Id: I887ae5af5aa95453245802b35d8efaa06822edad
Bugs: T158196
---
M manifests/site.pp
D modules/role/manifests/labs/nfs/primary.pp
2 files changed, 1 insertion(+), 27 deletions(-)

Approvals:
  Rush: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index 61ea65d..cf569c8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1459,7 +1459,7 @@
 }
 
 node /labstore100[12]\.eqiad\.wmnet/ {
-    role(labs::nfs::primary)
+    # soon to be recommissioned in T158196
     include ::standard
 }
 
diff --git a/modules/role/manifests/labs/nfs/primary.pp 
b/modules/role/manifests/labs/nfs/primary.pp
deleted file mode 100644
index 3b33f3a..0000000
--- a/modules/role/manifests/labs/nfs/primary.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# The role class for the NFS servers that provide general filesystem
-# services to Labs.
-#
-
-class role::labs::nfs::primary($monitor = 'eth0') {
-
-    system::role { 'role::labs::nfs::primary':
-        description => 'NFS primary share cluster',
-    }
-
-    include labstore::fileserver::primary
-    include labstore::backup_keys
-    include labstore::monitoring::interfaces
-    include labstore::monitoring::ldap
-    include labstore::monitoring::nfsd
-    include labstore::monitoring::exports
-
-    # Enable RPS to balance IRQs over CPUs
-    interface::rps { $monitor: }
-
-    # Use the CFQ I/O scheduler
-    grub::bootparam { 'elevator':
-        value => 'cfq',
-    }
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I887ae5af5aa95453245802b35d8efaa06822edad
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to