Madhuvishy has uploaded a new change for review.

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

Change subject: maps nfs: Remove mount at /project sourced from labstore1001
......................................................................

maps nfs: Remove mount at /project sourced from labstore1001

Bug: T147657
Change-Id: I32d29459c88f19443c975e1b67ff93656bf31e7f
---
M modules/labstore/files/nfs-mounts.yaml
M modules/role/manifests/labs/nfsclient.pp
2 files changed, 25 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/316816/1

diff --git a/modules/labstore/files/nfs-mounts.yaml 
b/modules/labstore/files/nfs-mounts.yaml
index 7e6542a..57ca2a3 100644
--- a/modules/labstore/files/nfs-mounts.yaml
+++ b/modules/labstore/files/nfs-mounts.yaml
@@ -93,8 +93,6 @@
     gid: 50196
     mounts:
       dumps: true
-      home: true
-      project: true
       scratch: true
       maps: true
   maps-team:
diff --git a/modules/role/manifests/labs/nfsclient.pp 
b/modules/role/manifests/labs/nfsclient.pp
index e258887..45c4422 100644
--- a/modules/role/manifests/labs/nfsclient.pp
+++ b/modules/role/manifests/labs/nfsclient.pp
@@ -35,6 +35,31 @@
             share_path  => '/maps',
             lookupcache => $lookupcache,
         }
+
+        # Temp - to remove existing mounts from labstore1001
+        labstore::nfs_mount { 'project-on-labstoresvc':
+            ensure      => 'absent',
+            mount_name  => 'project',
+            project     => $::labsproject,
+            options     => ['rw', $mode],
+            mount_path  => '/data/project',
+            share_path  => "/project/${::labsproject}/project",
+            server      => 'labstore.svc.eqiad.wmnet',
+            block       => true,
+            lookupcache => $lookupcache,
+        }
+
+        labstore::nfs_mount { 'home-on-labstoresvc':
+            ensure      => 'absent',
+            mount_name  => 'home',
+            project     => $::labsproject,
+            options     => ['rw', 'hard'],
+            mount_path  => '/home',
+            share_path  => "/project/${::labsproject}/home",
+            server      => 'labstore.svc.eqiad.wmnet',
+            block       => true,
+            lookupcache => $lookupcache,
+        }
     }
 
     labstore::nfs_mount { 'scratch-on-labstoresvc':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32d29459c88f19443c975e1b67ff93656bf31e7f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy <[email protected]>

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

Reply via email to