Revert "Switch everything to nfsv4 and new filer."

This reverts commit 85fa791bdf.

Conflicts:

	roles/nfs/client/tasks/main.yml
This commit is contained in:
Kevin Fenzi 2015-06-10 01:10:35 +00:00
parent 4dde89993d
commit f42e4e9306
10 changed files with 12 additions and 12 deletions

View file

@ -35,4 +35,4 @@ fedmsg_certs:
owner: root owner: root
group: masher group: masher
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid" nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"

View file

@ -35,4 +35,4 @@ fedmsg_certs:
owner: root owner: root
group: masher group: masher
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid" nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"

View file

@ -35,4 +35,4 @@ fedmsg_certs:
owner: root owner: root
group: masher group: masher
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid" nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"

View file

@ -4,4 +4,4 @@
# #
libdir: /usr/lib 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

View file

@ -4,4 +4,4 @@
# #
libdir: /usr/lib 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

View file

@ -36,4 +36,4 @@ kojipkgs_url: kojipkgs.fedoraproject.org
kojihub_url: koji.fedoraproject.org/kojihub kojihub_url: koji.fedoraproject.org/kojihub
kojihub_scheme: https 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

View file

@ -23,7 +23,7 @@
- sudo - sudo
- collectd/base - collectd/base
- { role: nfs/client, - { role: nfs/client,
mnt_dir: '/fedora_backups', mnt_dir: 'fedora_backups',
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid", nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid",
nfs_src_dir: 'fedora_backups' } nfs_src_dir: 'fedora_backups' }
- openvpn/client - openvpn/client

View file

@ -42,7 +42,7 @@
- git/server - git/server
- git/hooks - git/hooks
- clamav - 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 - distgit
tasks: tasks:

View file

@ -40,11 +40,11 @@
nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/archive' } nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/archive' }
- { role: nfs/client, - { role: nfs/client,
mnt_dir: '/srv/pub/alt', 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' } nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/alt' }
- { role: nfs/client, - { role: nfs/client,
mnt_dir: '/srv/pub/fedora-secondary', 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' } nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/fedora-secondary' }
- role: apache - role: apache

View file

@ -72,7 +72,7 @@
opts={{nfs_mount_opts}} opts={{nfs_mount_opts}}
passno=0 passno=0
dump=0 dump=0
state=mounted state=absent
when: datacenter == 'phx2' when: datacenter == 'phx2'
tags: tags:
- nfs/client - nfs/client
@ -85,7 +85,7 @@
opts={{nfs_mount_opts}} opts={{nfs_mount_opts}}
passno=0 passno=0
dump=0 dump=0
state=mounted state=absent
when: datacenter == 'rdu' when: datacenter == 'rdu'
tags: tags:
- nfs/client - nfs/client