Madhuvishy has submitted this change and it was merged.

Change subject: labstore: Mount maps share simultaneously from labstore1003 and 
1001
......................................................................


labstore: Mount maps share simultaneously from labstore1003 and 1001

Bug: T147657
Change-Id: Ia0e3fb63bba2d7b397930f66ef73196312f717b2
---
M hieradata/role/common/labs/nfs/misc.yaml
M modules/labstore/templates/exports.labs_extras.erb
M modules/role/manifests/labs/nfsclient.pp
3 files changed, 23 insertions(+), 0 deletions(-)

Approvals:
  Rush: Looks good to me, but someone else must approve
  Madhuvishy: Verified; Looks good to me, approved



diff --git a/hieradata/role/common/labs/nfs/misc.yaml 
b/hieradata/role/common/labs/nfs/misc.yaml
index af65f55..2f7749c 100644
--- a/hieradata/role/common/labs/nfs/misc.yaml
+++ b/hieradata/role/common/labs/nfs/misc.yaml
@@ -12,6 +12,16 @@
 role::labs::nfs::misc::dump_servers_ips:
   - '208.80.154.11'
   - '208.80.152.185'
+# List of internal ips for instances on maps project, to make maps share 
available on
+# New instances must be manually added here for the nfs share to be available.
+# This is a temporary change for T147657 until the misc server exports are 
managed by nfs-exportd
+role::labs::nfs::misc::maps_project_internal_ips:
+  - '10.68.16.6'
+  - '10.68.17.110'
+  - '10.68.16.103'
+  - '10.68.16.125'
+  - '10.68.17.33'
+  - '10.68.16.70'
 debdeploy::grains:
   debdeploy-labsnfs:
     value: standard
diff --git a/modules/labstore/templates/exports.labs_extras.erb 
b/modules/labstore/templates/exports.labs_extras.erb
index 573c86f..fd9f8e7 100644
--- a/modules/labstore/templates/exports.labs_extras.erb
+++ b/modules/labstore/templates/exports.labs_extras.erb
@@ -8,3 +8,4 @@
 /srv/dumps  *(ro,sec=sys,no_subtree_check,all_squash,nocrossmnt)
 /srv/statistics *(ro,sec=sys,no_subtree_check,all_squash,nocrossmnt)
 /srv/scratch *(rw,sec=sys,async,no_subtree_check,root_squash)
+/srv/maps   -rw,sec=sys,async,no_subtree_check,no_root_squash <%= 
Array(@maps_project_internal_ips).join(' ') %>
diff --git a/modules/role/manifests/labs/nfsclient.pp 
b/modules/role/manifests/labs/nfsclient.pp
index f053b3e..e258887 100644
--- a/modules/role/manifests/labs/nfsclient.pp
+++ b/modules/role/manifests/labs/nfsclient.pp
@@ -25,6 +25,18 @@
         lookupcache => $lookupcache,
     }
 
+    if $::labsproject == 'maps' {
+        labstore::nfs_mount { 'maps-on-labstore1003':
+            mount_name  => 'maps',
+            project     => $::labsproject,
+            options     => ['rw', 'soft', 'timeo=300', 'retrans=3'],
+            mount_path  => '/mnt/nfs/labstore1003-maps',
+            server      => 'labstore1003.eqiad.wmnet',
+            share_path  => '/maps',
+            lookupcache => $lookupcache,
+        }
+    }
+
     labstore::nfs_mount { 'scratch-on-labstoresvc':
         ensure      => absent,
         mount_name  => 'scratch',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0e3fb63bba2d7b397930f66ef73196312f717b2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy <mviswanat...@wikimedia.org>
Gerrit-Reviewer: Madhuvishy <mviswanat...@wikimedia.org>
Gerrit-Reviewer: Rush <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