[MediaWiki-commits] [Gerrit] labs: Allow granular control over which NFS mounts are mounted - change (operations/puppet)

2015-06-10 Thread Yuvipanda (Code Review) 
Yuvipanda has uploaded a new change for review.

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

Change subject: labs: Allow granular control over which NFS mounts are mounted
..

labs: Allow granular control over which NFS mounts are mounted

Bug: T101660
Change-Id: I79c1fcd8d62fe48d719bad8ce3f64b7b00c4ceeb
---
M hieradata/labs.yaml
M manifests/role/labs.pp
2 files changed, 26 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/217242/1

diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index ae7b8e2..7591108 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -45,3 +45,8 @@
 labs_puppet_master: labs-puppetmaster-eqiad.wikimedia.org
 labs_puppet_master_secondary: labs-puppetmaster-codfw.wikimedia.org
 labs_recursor: labs-recursor0.wikimedia.org
+nfs_mounts:
+  project: true
+  home: true
+  scratch: true
+  dumps: true
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 6ddc81b..3659266 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -42,11 +42,13 @@
 ensure = present,
 }
 
+$nfs_mounts = hiera('nfs_mounts')
+
 $nfs_opts = 'vers=4,bg,hard,intr,sec=sys,proto=tcp,port=0,noatime,nofsc'
 $nfs_server = 'labstore.svc.eqiad.wmnet'
 $dumps_server = 'labstore1003.eqiad.wmnet'
 
-if hiera('has_shared_home', true) {
+if $nfs_mounts['home'] {
 mount { '/home':
 ensure  = mounted,
 atboot  = true,
@@ -57,7 +59,7 @@
 }
 }
 
-if hiera('has_shared_project_space', true) {
+if $nfs_mounts['project'] or $nfs_mounts['scratch'] {
 # Directory for data mounts
 file { '/data':
 ensure = directory,
@@ -65,7 +67,9 @@
 group  = 'root',
 mode   = '0755',
 }
+}
 
+if $nfs_mounts['project'] {
 file { '/data/project':
 ensure  = directory,
 require = File['/data'],
@@ -79,7 +83,9 @@
 device  = ${nfs_server}:/project/${instanceproject}/project,
 require = File['/data/project', '/etc/modprobe.d/nfs-no-idmap'],
 }
+}
 
+if $nfs_mounts['scratch'] {
 file { '/data/scratch':
 ensure  = directory,
 require = File['/data'],
@@ -95,17 +101,19 @@
 }
 }
 
-file { '/public/dumps':
-ensure  = directory,
-require = File['/public'],
-}
-mount { '/public/dumps':
-ensure  = mounted,
-atboot  = true,
-fstype  = 'nfs',
-options = ro,${nfs_opts},
-device  = ${dumps_server}:/dumps,
-require = File['/public/dumps', '/etc/modprobe.d/nfs-no-idmap'],
+if $nfs_mounts['dumps'] {
+file { '/public/dumps':
+ensure  = directory,
+require = File['/public'],
+}
+mount { '/public/dumps':
+ensure  = mounted,
+atboot  = true,
+fstype  = 'nfs',
+options = ro,${nfs_opts},
+device  = ${dumps_server}:/dumps,
+require = File['/public/dumps', '/etc/modprobe.d/nfs-no-idmap'],
+}
 }
 
 file { '/public/keys':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79c1fcd8d62fe48d719bad8ce3f64b7b00c4ceeb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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

[MediaWiki-commits] [Gerrit] labs: Allow granular control over which NFS mounts are mounted - change (operations/puppet)

2015-06-10 Thread Yuvipanda (Code Review) 
Yuvipanda has submitted this change and it was merged.

Change subject: labs: Allow granular control over which NFS mounts are mounted
..


labs: Allow granular control over which NFS mounts are mounted

Bug: T101660
Change-Id: I79c1fcd8d62fe48d719bad8ce3f64b7b00c4ceeb
---
M hieradata/labs.yaml
M manifests/role/labs.pp
2 files changed, 26 insertions(+), 13 deletions(-)

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



diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index ae7b8e2..7591108 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -45,3 +45,8 @@
 labs_puppet_master: labs-puppetmaster-eqiad.wikimedia.org
 labs_puppet_master_secondary: labs-puppetmaster-codfw.wikimedia.org
 labs_recursor: labs-recursor0.wikimedia.org
+nfs_mounts:
+  project: true
+  home: true
+  scratch: true
+  dumps: true
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 6ddc81b..3659266 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -42,11 +42,13 @@
 ensure = present,
 }
 
+$nfs_mounts = hiera('nfs_mounts')
+
 $nfs_opts = 'vers=4,bg,hard,intr,sec=sys,proto=tcp,port=0,noatime,nofsc'
 $nfs_server = 'labstore.svc.eqiad.wmnet'
 $dumps_server = 'labstore1003.eqiad.wmnet'
 
-if hiera('has_shared_home', true) {
+if $nfs_mounts['home'] {
 mount { '/home':
 ensure  = mounted,
 atboot  = true,
@@ -57,7 +59,7 @@
 }
 }
 
-if hiera('has_shared_project_space', true) {
+if $nfs_mounts['project'] or $nfs_mounts['scratch'] {
 # Directory for data mounts
 file { '/data':
 ensure = directory,
@@ -65,7 +67,9 @@
 group  = 'root',
 mode   = '0755',
 }
+}
 
+if $nfs_mounts['project'] {
 file { '/data/project':
 ensure  = directory,
 require = File['/data'],
@@ -79,7 +83,9 @@
 device  = ${nfs_server}:/project/${instanceproject}/project,
 require = File['/data/project', '/etc/modprobe.d/nfs-no-idmap'],
 }
+}
 
+if $nfs_mounts['scratch'] {
 file { '/data/scratch':
 ensure  = directory,
 require = File['/data'],
@@ -95,17 +101,19 @@
 }
 }
 
-file { '/public/dumps':
-ensure  = directory,
-require = File['/public'],
-}
-mount { '/public/dumps':
-ensure  = mounted,
-atboot  = true,
-fstype  = 'nfs',
-options = ro,${nfs_opts},
-device  = ${dumps_server}:/dumps,
-require = File['/public/dumps', '/etc/modprobe.d/nfs-no-idmap'],
+if $nfs_mounts['dumps'] {
+file { '/public/dumps':
+ensure  = directory,
+require = File['/public'],
+}
+mount { '/public/dumps':
+ensure  = mounted,
+atboot  = true,
+fstype  = 'nfs',
+options = ro,${nfs_opts},
+device  = ${dumps_server}:/dumps,
+require = File['/public/dumps', '/etc/modprobe.d/nfs-no-idmap'],
+}
 }
 
 file { '/public/keys':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I79c1fcd8d62fe48d719bad8ce3f64b7b00c4ceeb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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