From f42e4e93068e41af790b7b241c7398e629fb2149 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 10 Jun 2015 01:10:35 +0000 Subject: [PATCH] Revert "Switch everything to nfsv4 and new filer." This reverts commit 85fa791bdf93244156bef65e18ae9a3798b27435. Conflicts: roles/nfs/client/tasks/main.yml --- inventory/group_vars/bodhi-backend | 2 +- inventory/group_vars/composers | 2 +- inventory/group_vars/releng | 2 +- inventory/host_vars/arm01-releng00.arm.fedoraproject.org | 2 +- inventory/host_vars/arm01-releng02.arm.fedoraproject.org | 2 +- inventory/host_vars/compose-x86-01.phx2.fedoraproject.org | 2 +- playbooks/groups/backup-server.yml | 2 +- playbooks/groups/pkgs.yml | 2 +- playbooks/groups/secondary.yml | 4 ++-- roles/nfs/client/tasks/main.yml | 4 ++-- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/inventory/group_vars/bodhi-backend b/inventory/group_vars/bodhi-backend index 6dccae88b5..f3befd4372 100644 --- a/inventory/group_vars/bodhi-backend +++ b/inventory/group_vars/bodhi-backend @@ -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" diff --git a/inventory/group_vars/composers b/inventory/group_vars/composers index b70c0ccd21..82cd018cad 100644 --- a/inventory/group_vars/composers +++ b/inventory/group_vars/composers @@ -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" diff --git a/inventory/group_vars/releng b/inventory/group_vars/releng index b70c0ccd21..82cd018cad 100644 --- a/inventory/group_vars/releng +++ b/inventory/group_vars/releng @@ -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" diff --git a/inventory/host_vars/arm01-releng00.arm.fedoraproject.org b/inventory/host_vars/arm01-releng00.arm.fedoraproject.org index 22d8ae4e8e..d9f5686198 100644 --- a/inventory/host_vars/arm01-releng00.arm.fedoraproject.org +++ b/inventory/host_vars/arm01-releng00.arm.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/arm01-releng02.arm.fedoraproject.org b/inventory/host_vars/arm01-releng02.arm.fedoraproject.org index 22d8ae4e8e..d9f5686198 100644 --- a/inventory/host_vars/arm01-releng02.arm.fedoraproject.org +++ b/inventory/host_vars/arm01-releng02.arm.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org index 224434eeee..529bd02403 100644 --- a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org +++ b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org @@ -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 diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index b457888d21..8334f6aeb6 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -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 diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index 8848c507a1..b9372eb18b 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -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: diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml index 82fdd9ec32..81479b635d 100644 --- a/playbooks/groups/secondary.yml +++ b/playbooks/groups/secondary.yml @@ -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 diff --git a/roles/nfs/client/tasks/main.yml b/roles/nfs/client/tasks/main.yml index 09627c7887..9740a59827 100644 --- a/roles/nfs/client/tasks/main.yml +++ b/roles/nfs/client/tasks/main.yml @@ -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