Revert "Switch everything to nfsv4 and new filer."
This reverts commit 85fa791bdf
.
Conflicts:
roles/nfs/client/tasks/main.yml
This commit is contained in:
parent
4dde89993d
commit
f42e4e9306
10 changed files with 12 additions and 12 deletions
|
@ -35,4 +35,4 @@ fedmsg_certs:
|
|||
owner: root
|
||||
group: masher
|
||||
|
||||
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"
|
||||
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
|
||||
|
|
|
@ -35,4 +35,4 @@ fedmsg_certs:
|
|||
owner: root
|
||||
group: masher
|
||||
|
||||
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"
|
||||
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
|
||||
|
|
|
@ -35,4 +35,4 @@ fedmsg_certs:
|
|||
owner: root
|
||||
group: masher
|
||||
|
||||
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"
|
||||
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
|
||||
|
|
|
@ -4,4 +4,4 @@
|
|||
#
|
||||
libdir: /usr/lib
|
||||
|
||||
nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid
|
||||
nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3
|
||||
|
|
|
@ -4,4 +4,4 @@
|
|||
#
|
||||
libdir: /usr/lib
|
||||
|
||||
nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid
|
||||
nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3
|
||||
|
|
|
@ -36,4 +36,4 @@ kojipkgs_url: kojipkgs.fedoraproject.org
|
|||
kojihub_url: koji.fedoraproject.org/kojihub
|
||||
kojihub_scheme: https
|
||||
|
||||
nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid
|
||||
nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
- sudo
|
||||
- collectd/base
|
||||
- { role: nfs/client,
|
||||
mnt_dir: '/fedora_backups',
|
||||
mnt_dir: 'fedora_backups',
|
||||
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid",
|
||||
nfs_src_dir: 'fedora_backups' }
|
||||
- openvpn/client
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
- git/server
|
||||
- git/hooks
|
||||
- clamav
|
||||
- { role: nfs/client, when: env != "staging", mnt_dir: '/srv/cache/lookaside', nfs_src_dir: 'fedora_sourcecache', nfs_mount_opts='rw,hard,bg,intr,noatime,nodev,nosuid' }
|
||||
- { role: nfs/client, when: env != "staging", mnt_dir: '/srv/cache/lookaside', nfs_src_dir: 'fedora_sourcecache', nfs_mount_opts='rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3' }
|
||||
- distgit
|
||||
|
||||
tasks:
|
||||
|
|
|
@ -40,11 +40,11 @@
|
|||
nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/archive' }
|
||||
- { role: nfs/client,
|
||||
mnt_dir: '/srv/pub/alt',
|
||||
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid",
|
||||
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3",
|
||||
nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/alt' }
|
||||
- { role: nfs/client,
|
||||
mnt_dir: '/srv/pub/fedora-secondary',
|
||||
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid",
|
||||
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3",
|
||||
nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/fedora-secondary' }
|
||||
|
||||
- role: apache
|
||||
|
|
|
@ -72,7 +72,7 @@
|
|||
opts={{nfs_mount_opts}}
|
||||
passno=0
|
||||
dump=0
|
||||
state=mounted
|
||||
state=absent
|
||||
when: datacenter == 'phx2'
|
||||
tags:
|
||||
- nfs/client
|
||||
|
@ -85,7 +85,7 @@
|
|||
opts={{nfs_mount_opts}}
|
||||
passno=0
|
||||
dump=0
|
||||
state=mounted
|
||||
state=absent
|
||||
when: datacenter == 'rdu'
|
||||
tags:
|
||||
- nfs/client
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue