summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Fenzi <kevin@scrye.com>2014-04-24 19:21:59 +0000
committerKevin Fenzi <kevin@scrye.com>2014-04-24 19:21:59 +0000
commit0982cd46a9c6b4d54fda2a08b832a1acce2b6cb6 (patch)
tree94020980ff1988d36bb2a19f0b74d40a006c5427
parent9216d087ea9b6568aa4da28c4f7dac3ce619f894 (diff)
downloadansible-0982cd46a9c6b4d54fda2a08b832a1acce2b6cb6.tar.gz
ansible-0982cd46a9c6b4d54fda2a08b832a1acce2b6cb6.tar.xz
ansible-0982cd46a9c6b4d54fda2a08b832a1acce2b6cb6.zip
Make nfs mount a variable and set it to use rw on wiki instances.
-rw-r--r--inventory/group_vars/all3
-rw-r--r--inventory/group_vars/wiki2
-rw-r--r--inventory/group_vars/wiki-stg2
-rw-r--r--roles/nfs_client/tasks/main.yml2
4 files changed, 8 insertions, 1 deletions
diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index 43534d4cc..e1a4d129b 100644
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@@ -48,3 +48,6 @@ nrpe_procs_crit: 200
# env is staging or production, we default it to production here.
env: production
+
+# nfs mount options, override at the group/host level
+nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid"
diff --git a/inventory/group_vars/wiki b/inventory/group_vars/wiki
index f32aae17f..5950013e9 100644
--- a/inventory/group_vars/wiki
+++ b/inventory/group_vars/wiki
@@ -23,3 +23,5 @@ fedmsg_certs:
- service: mediawiki
owner: root
group: apache
+
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"
diff --git a/inventory/group_vars/wiki-stg b/inventory/group_vars/wiki-stg
index f32aae17f..5950013e9 100644
--- a/inventory/group_vars/wiki-stg
+++ b/inventory/group_vars/wiki-stg
@@ -23,3 +23,5 @@ fedmsg_certs:
- service: mediawiki
owner: root
group: apache
+
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"
diff --git a/roles/nfs_client/tasks/main.yml b/roles/nfs_client/tasks/main.yml
index a6e389cf9..10712880f 100644
--- a/roles/nfs_client/tasks/main.yml
+++ b/roles/nfs_client/tasks/main.yml
@@ -28,7 +28,7 @@
name=/mnt/{{ mnt_dir }}
src=vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/{{ nfs_src_dir }}
fstype=nfs
- opts=ro,hard,bg,intr,noatime,nodev,nosuid
+ opts={{nfs_mount_opts}}
passno=0
dump=0
state=mounted