Move most netapp nfs mounts to nfsv4

inventory/group_vars/all

@@ -137,7 +137,7 @@ env: production
 env_suffix:
 
 # nfs mount options, override at the group/host level
-nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
 
 # by default set become to false here We can override it as needed. 
 # Note that if become is true, you need to unset requiretty for 

inventory/group_vars/batcave

@@ -12,7 +12,7 @@ fas_client_groups: sysadmin-ask,sysadmin-build,sysadmin-cvs,sysadmin-main,sysadm
 
 ansible_base: /srv/web/infra
 freezes: false
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
 
 fedmsg_certs:
 - service: shell

inventory/group_vars/download-phx2

@@ -8,6 +8,6 @@ nrpe_procs_crit: 1000
 host_group: download-phx2
 
 # nfs mount options, overrides the all/default
-nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,actimeo=600,nfsvers=3"
+nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,actimeo=600,nfsvers=4"
 
 blocked_ips: [ '8.39.100.100', '46.29.92.6', '69.47.68.211', '83.110.159.237', '103.193.116.147', '130.193.57.106', '130.193.60.205', '158.39.4.2', '169.53.165.245', '193.52.32.69', '195.23.131.253', '198.11.167.9', '202.202.43.41' ]

inventory/group_vars/koji

@@ -41,7 +41,7 @@ fedmsg_certs:
   - buildsys.task.state.change
   - buildsys.untag
 
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
 virt_install_command: "{{ virt_install_command_two_nic }}"
 
 osbs_fqdn: "osbs.fedorainfracloud.org"

inventory/group_vars/koji-stg

@@ -35,7 +35,7 @@ fedmsg_certs:
   - buildsys.untag
 
 # NOTE -- staging mounts read-only
-nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 
 koji_server_url: "http://koji.stg.fedoraproject.org/kojihub"

inventory/group_vars/releng

@@ -1,46 +0,0 @@
----
-# common items for the releng-* boxes
-lvm_size: 100000
-mem_size: 16384
-num_cpus: 16
-nm: 255.255.255.0
-gw: 10.5.125.254
-dns: 10.5.126.21
-
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
-ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
-
-virt_install_command: "{{ virt_install_command_two_nic }}"
-
-# With 16 cpus, theres a bunch more kernel threads
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
-
-host_group: releng
-
-# These are consumed by a task in roles/fedmsg/base/main.yml
-fedmsg_certs:
-- service: shell
-  owner: root
-  group: root
-  can_send:
-  - logger.log
-- service: bodhi
-  owner: root
-  group: masher
-  can_send:
-  - bodhi.mashtask.complete
-  - bodhi.mashtask.mashing
-  - bodhi.mashtask.start
-  - bodhi.mashtask.sync.done
-  - bodhi.mashtask.sync.wait
-  - bodhi.errata.publish
-  - bodhi.update.eject
-- service: ftpsync
-  owner: root
-  group: ftpsync
-  can_send:
-  - bodhi.updates.epel.sync
-  - bodhi.updates.fedora.sync
-
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"

inventory/group_vars/releng-compose

@@ -16,7 +16,7 @@ fas_client_groups: sysadmin-releng
 freezes: true
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
 
 # For the mock config
 kojipkgs_url: kojipkgs.fedoraproject.org

inventory/group_vars/secondary

@@ -6,7 +6,7 @@ nrpe_procs_warn: 900
 nrpe_procs_crit: 1000
 
 # nfs mount options, overrides the all/default
-nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,actimeo=600,nfsvers=3"
+nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,actimeo=600,nfsvers=4"
 
 fas_client_groups: sysadmin-noc,alt-sugar,alt-k12linux,altvideos,hosted-content,mips-content,s390_content,fi-apprentice,qa-deltaisos
 

inventory/group_vars/wiki

@@ -30,7 +30,7 @@ fedmsg_certs:
   - wiki.article.edit
   - wiki.upload.complete
 
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
 
 csi_security_category: Moderate
 csi_primary_contact: #fedora-admin

inventory/group_vars/wiki-stg

@@ -30,4 +30,4 @@ fedmsg_certs:
   - wiki.article.edit
   - wiki.upload.complete
 
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"

inventory/host_vars/arm01-releng00.arm.fedoraproject.org

@@ -1,10 +0,0 @@
----
-#
-# These are 32bit
-#
-libdir: /usr/lib
-
-nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3
-
-eth0_ip: 10.5.78.10
-gw: 10.5.78.254

inventory/host_vars/arm01-releng02.arm.fedoraproject.org

@@ -1,10 +0,0 @@
----
-#
-# These are 32bit
-#
-libdir: /usr/lib
-
-nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3
-
-eth0_ip: 10.5.78.12
-gw: 10.5.78.254

inventory/host_vars/arm02-builder21.arm.fedoraproject.org

@@ -4,5 +4,5 @@
 # The rest of the group can be ro, it's only builders in the
 # compose channel that need a rw mount
 
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
 koji_hub_nfs: "fedora_koji"

inventory/host_vars/arm02-builder23.arm.fedoraproject.org

@@ -4,5 +4,5 @@
 # The rest of the group can be ro, it's only builders in the
 # compose channel that need a rw mount
 
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
 koji_hub_nfs: "fedora_koji"

inventory/host_vars/arm04-builder00.arm.fedoraproject.org

@@ -4,5 +4,5 @@
 # The rest of the group can be ro, it's only builders in the
 # compose channel that need a rw mount
 
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
 koji_hub_nfs: "fedora_koji"

inventory/host_vars/arm04-builder01.arm.fedoraproject.org

@@ -4,5 +4,5 @@
 # The rest of the group can be ro, it's only builders in the
 # compose channel that need a rw mount
 
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
 koji_hub_nfs: "fedora_koji"

inventory/host_vars/buildhw-01.phx2.fedoraproject.org

@@ -4,7 +4,7 @@
 # The rest of the group can be ro, it's only builders in the
 # compose channel that need a rw mount
 
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
 
 gw: 10.5.125.254
 eth0_ip: 10.5.125.94

inventory/host_vars/buildvm-01.phx2.fedoraproject.org

@@ -8,4 +8,4 @@ eth1_ip: 10.5.127.158
 # The rest of the group can be ro, it's only builders in the 
 # compose channel that need a rw mount
 
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"

inventory/host_vars/compose-x86-01.phx2.fedoraproject.org

@@ -28,7 +28,7 @@ kojipkgs_url: kojipkgs.fedoraproject.org
 kojihub_url: koji.fedoraproject.org/kojihub
 kojihub_scheme: https
 
-nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3
+nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4
 
 fedmsg_certs:
 - service: releng

inventory/host_vars/data-analysis01.phx2.fedoraproject.org

@@ -5,7 +5,7 @@ freezes: false
 # this box mounts a large share from the netapp to store combined http
 # logs from the proxies.
 
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
 
 # general configs
 nrpe_procs_warn: 900

inventory/host_vars/mm-backend01.phx2.fedoraproject.org

@@ -13,7 +13,7 @@ vmhost: virthost03.phx2.fedoraproject.org
 datacenter: phx2
 
 # nfs mount options, overrides the all/default
-nfs_mount_opts: "ro,hard,bg,intr,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "ro,hard,bg,intr,nodev,nosuid,nfsvers=4"
 
 # We define this here to override the global one because we need eth1
 virt_install_command: "{{ virt_install_command_two_nic }}"

inventory/host_vars/mm-backend01.stg.phx2.fedoraproject.org

@@ -14,7 +14,7 @@ vmhost: virthost16.phx2.fedoraproject.org
 datacenter: phx2
 
 # nfs mount options, overrides the all/default
-nfs_mount_opts: "ro,hard,bg,intr,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "ro,hard,bg,intr,nodev,nosuid,nfsvers=4"
 
 # We define this here to override the global one because we need eth1
 virt_install_command: "{{ virt_install_command_two_nic }}"

inventory/host_vars/pkgs02.phx2.fedoraproject.org

@@ -17,4 +17,4 @@ num_cpus: 8
 virt_install_command: "{{ virt_install_command_two_nic }}"
 
 host_backup_targets: ['/srv']
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"

playbooks/groups/gnome-backups.yml

@@ -21,7 +21,7 @@
   - gnome_backups
   - { role: nfs/client,
       mnt_dir: '/gnome_backups',
-      nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3",
+      nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4",
       nfs_src_dir: 'gnome_backups' }
 
   tasks:

playbooks/groups/logserver.yml

@@ -49,5 +49,5 @@
 
   - role: nfs/client
     mnt_dir: '/mnt/fedora_stats'
-    nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+    nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
     nfs_src_dir: 'fedora_stats'

playbooks/groups/pkgs.yml

@@ -27,7 +27,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,nfsvers=3' } 
+  - { 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=4' } 
   - role: distgit
     tags: distgit
 

playbooks/groups/secondary.yml

@@ -25,11 +25,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,nfsvers=3",
+      nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4",
       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,nfsvers=3",
+      nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4",
       nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/fedora-secondary' }
 
   - role: apache

playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml

@@ -45,7 +45,7 @@
   roles:
    - role: nfs/client
      mnt_dir: '/mnt/fedora_stats'
-     nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+     nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
      nfs_src_dir: 'fedora_stats'
    - geoip