From efd7efccd5c83b98168ea2b561b90bce5967442d Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Fri, 25 Aug 2017 17:04:22 +0000 Subject: [PATCH] move all nfsv4 mounts to 4.0 --- inventory/group_vars/all | 2 +- inventory/group_vars/autosign | 2 +- inventory/group_vars/batcave | 2 +- inventory/group_vars/bodhi-backend | 2 +- inventory/group_vars/buildvm-aarch64-stg | 2 +- inventory/group_vars/buildvm-armv7-stg | 2 +- inventory/group_vars/buildvm-ppc64-stg | 2 +- inventory/group_vars/buildvm-ppc64le-stg | 2 +- inventory/group_vars/buildvm-stg | 2 +- inventory/group_vars/koji | 2 +- inventory/group_vars/koji-stg | 2 +- inventory/group_vars/releng-compose | 2 +- inventory/group_vars/releng-secondary | 2 +- inventory/group_vars/releng-stg | 2 +- inventory/group_vars/runroot | 2 +- inventory/group_vars/wiki | 2 +- inventory/group_vars/wiki-stg | 2 +- inventory/host_vars/mm-backend01.phx2.fedoraproject.org | 2 +- inventory/host_vars/mm-backend01.stg.phx2.fedoraproject.org | 2 +- inventory/host_vars/pkgs02.phx2.fedoraproject.org | 2 +- playbooks/groups/backup-server.yml | 2 +- playbooks/groups/gnome-backups.yml | 2 +- playbooks/groups/logserver.yml | 2 +- playbooks/groups/pkgs.yml | 4 ++-- playbooks/groups/taskotron.yml | 6 +++--- playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml | 2 +- 26 files changed, 29 insertions(+), 29 deletions(-) diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 182a0d5d90..e18af2f833 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -203,7 +203,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=4" +nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4.0" # 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 diff --git a/inventory/group_vars/autosign b/inventory/group_vars/autosign index c0db212867..b00192c727 100644 --- a/inventory/group_vars/autosign +++ b/inventory/group_vars/autosign @@ -21,7 +21,7 @@ host_group: autosign fedmsg_error_recipients: - puiterwijk@fedoraproject.org -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" # For the MOTD csi_security_category: High diff --git a/inventory/group_vars/batcave b/inventory/group_vars/batcave index d61c79a001..a906e7f4c4 100644 --- a/inventory/group_vars/batcave +++ b/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,sec=sys,nfsvers=4" +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" fedmsg_certs: - service: shell diff --git a/inventory/group_vars/bodhi-backend b/inventory/group_vars/bodhi-backend index c30905c76b..b02fbf4ae1 100644 --- a/inventory/group_vars/bodhi-backend +++ b/inventory/group_vars/bodhi-backend @@ -42,7 +42,7 @@ fedmsg_error_recipients: # happens instead at the inventory/host_vars/ level since bodhi-backend03 and # bodhi-backend02 have different roles and responsibilities. -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" fas_client_groups: sysadmin-releng,sysadmin-bodhi sudoers: "{{ private }}/files/sudo/00releng-sudoers" diff --git a/inventory/group_vars/buildvm-aarch64-stg b/inventory/group_vars/buildvm-aarch64-stg index 587171781e..5cef0f69d6 100644 --- a/inventory/group_vars/buildvm-aarch64-stg +++ b/inventory/group_vars/buildvm-aarch64-stg @@ -17,7 +17,7 @@ host_group: kojibuilder fas_client_groups: sysadmin-releng sudoers: "{{ private }}/files/sudo/00releng-sudoers" datacenter: staging -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" koji_hub_nfs: "fedora_koji" koji_server_url: "https://koji.stg.fedoraproject.org/kojihub" diff --git a/inventory/group_vars/buildvm-armv7-stg b/inventory/group_vars/buildvm-armv7-stg index 587171781e..5cef0f69d6 100644 --- a/inventory/group_vars/buildvm-armv7-stg +++ b/inventory/group_vars/buildvm-armv7-stg @@ -17,7 +17,7 @@ host_group: kojibuilder fas_client_groups: sysadmin-releng sudoers: "{{ private }}/files/sudo/00releng-sudoers" datacenter: staging -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" koji_hub_nfs: "fedora_koji" koji_server_url: "https://koji.stg.fedoraproject.org/kojihub" diff --git a/inventory/group_vars/buildvm-ppc64-stg b/inventory/group_vars/buildvm-ppc64-stg index 587171781e..5cef0f69d6 100644 --- a/inventory/group_vars/buildvm-ppc64-stg +++ b/inventory/group_vars/buildvm-ppc64-stg @@ -17,7 +17,7 @@ host_group: kojibuilder fas_client_groups: sysadmin-releng sudoers: "{{ private }}/files/sudo/00releng-sudoers" datacenter: staging -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" koji_hub_nfs: "fedora_koji" koji_server_url: "https://koji.stg.fedoraproject.org/kojihub" diff --git a/inventory/group_vars/buildvm-ppc64le-stg b/inventory/group_vars/buildvm-ppc64le-stg index 587171781e..5cef0f69d6 100644 --- a/inventory/group_vars/buildvm-ppc64le-stg +++ b/inventory/group_vars/buildvm-ppc64le-stg @@ -17,7 +17,7 @@ host_group: kojibuilder fas_client_groups: sysadmin-releng sudoers: "{{ private }}/files/sudo/00releng-sudoers" datacenter: staging -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" koji_hub_nfs: "fedora_koji" koji_server_url: "https://koji.stg.fedoraproject.org/kojihub" diff --git a/inventory/group_vars/buildvm-stg b/inventory/group_vars/buildvm-stg index 4e6704f15c..b5c70b82c3 100644 --- a/inventory/group_vars/buildvm-stg +++ b/inventory/group_vars/buildvm-stg @@ -17,7 +17,7 @@ host_group: kojibuilder fas_client_groups: sysadmin-releng sudoers: "{{ private }}/files/sudo/00releng-sudoers" datacenter: staging -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" koji_hub_nfs: "fedora_koji" koji_server_url: "https://koji.stg.fedoraproject.org/kojihub" diff --git a/inventory/group_vars/koji b/inventory/group_vars/koji index 0e469278ff..6a9773ac2e 100644 --- a/inventory/group_vars/koji +++ b/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,sec=sys,nfsvers=4" +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" virt_install_command: "{{ virt_install_command_two_nic }}" osbs_url: "osbs.fedoraproject.org" diff --git a/inventory/group_vars/koji-stg b/inventory/group_vars/koji-stg index 5a40d1d6ec..8750fc6f4a 100644 --- a/inventory/group_vars/koji-stg +++ b/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=4" +nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4.0" # This is for mizdebsk only in stg. Put here by threebean. Cleared with nirik. sudoers: "{{ private }}/files/sudo/koji01.stg.phx2.fedoraproject.org-sudoers" diff --git a/inventory/group_vars/releng-compose b/inventory/group_vars/releng-compose index b55a6f1a1e..57edff3fc3 100644 --- a/inventory/group_vars/releng-compose +++ b/inventory/group_vars/releng-compose @@ -20,7 +20,7 @@ fas_client_groups: sysadmin-releng freezes: true sudoers: "{{ private }}/files/sudo/00releng-sudoers" -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" # For the mock config kojipkgs_url: kojipkgs.fedoraproject.org diff --git a/inventory/group_vars/releng-secondary b/inventory/group_vars/releng-secondary index 170e63e2fe..08c04b8885 100644 --- a/inventory/group_vars/releng-secondary +++ b/inventory/group_vars/releng-secondary @@ -11,7 +11,7 @@ dns: 10.5.126.21 nrpe_procs_warn: 900 nrpe_procs_crit: 1000 -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" fas_client_groups: sysadmin-releng,sysadmin-secondary,sysadmin-noc,sysadmin-veteran sudoers: "{{ private }}/files/sudo/00releng-sudoers" diff --git a/inventory/group_vars/releng-stg b/inventory/group_vars/releng-stg index e8877bed47..17b2c7f536 100644 --- a/inventory/group_vars/releng-stg +++ b/inventory/group_vars/releng-stg @@ -3,7 +3,7 @@ koji_server_url: "https://koji.stg.fedoraproject.org/kojihub" koji_weburl: "https://koji.stg.fedoraproject.org/koji" koji_topurl: "https://kojipkgs.fedoraproject.org/" -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" mem_size: 8192 num_cpus: 4 diff --git a/inventory/group_vars/runroot b/inventory/group_vars/runroot index cbcbbfbe3c..213fb63290 100644 --- a/inventory/group_vars/runroot +++ b/inventory/group_vars/runroot @@ -3,4 +3,4 @@ # We need to mount koji storage rw here so run_root can work. # 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,sec=sys,nfsvers=4" +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" diff --git a/inventory/group_vars/wiki b/inventory/group_vars/wiki index ae63ab64e6..4e660c7b79 100644 --- a/inventory/group_vars/wiki +++ b/inventory/group_vars/wiki @@ -31,7 +31,7 @@ fedmsg_certs: - wiki.article.edit - wiki.upload.complete -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" csi_security_category: Moderate csi_primary_contact: "#fedora-admin" diff --git a/inventory/group_vars/wiki-stg b/inventory/group_vars/wiki-stg index cf00362988..f28523661f 100644 --- a/inventory/group_vars/wiki-stg +++ b/inventory/group_vars/wiki-stg @@ -29,4 +29,4 @@ fedmsg_certs: - wiki.article.edit - wiki.upload.complete -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" diff --git a/inventory/host_vars/mm-backend01.phx2.fedoraproject.org b/inventory/host_vars/mm-backend01.phx2.fedoraproject.org index ef9a29ed08..a74a3b8485 100644 --- a/inventory/host_vars/mm-backend01.phx2.fedoraproject.org +++ b/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=4" +nfs_mount_opts: "ro,hard,bg,intr,nodev,nosuid,nfsvers=4.0" # We define this here to override the global one because we need eth1 virt_install_command: "{{ virt_install_command_two_nic }}" diff --git a/inventory/host_vars/mm-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/mm-backend01.stg.phx2.fedoraproject.org index 3dd8acc8b7..8c49466386 100644 --- a/inventory/host_vars/mm-backend01.stg.phx2.fedoraproject.org +++ b/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=4" +nfs_mount_opts: "ro,hard,bg,intr,nodev,nosuid,nfsvers=4.0" # We define this here to override the global one because we need eth1 virt_install_command: "{{ virt_install_command_two_nic }}" diff --git a/inventory/host_vars/pkgs02.phx2.fedoraproject.org b/inventory/host_vars/pkgs02.phx2.fedoraproject.org index b041d3ccbc..a76fb7dc19 100644 --- a/inventory/host_vars/pkgs02.phx2.fedoraproject.org +++ b/inventory/host_vars/pkgs02.phx2.fedoraproject.org @@ -17,7 +17,7 @@ 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,sec=sys,nfsvers=4" +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" ssh_hostnames: - pkgs.fedoraproject.org diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index 42ab94d1d0..e2d95cb124 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -23,7 +23,7 @@ - collectd/base - { role: nfs/client, mnt_dir: '/fedora_backups', - nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4", + nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0", nfs_src_dir: 'fedora_backups' } - openvpn/client diff --git a/playbooks/groups/gnome-backups.yml b/playbooks/groups/gnome-backups.yml index 204a97ba15..631bf4280d 100644 --- a/playbooks/groups/gnome-backups.yml +++ b/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,sec=sys,nfsvers=4", + nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0", nfs_src_dir: 'gnome_backups' } tasks: diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index 79e3fc7ebe..1adca83a3d 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -59,7 +59,7 @@ - cloudstats - role: nfs/client mnt_dir: '/mnt/fedora_stats' - nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" + nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" nfs_src_dir: 'fedora_stats' handlers: diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index 7c797d713f..0d0091be87 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -32,11 +32,11 @@ - { 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,sec=sys,nfsvers=4' } + nfs_src_dir: 'fedora_sourcecache', nfs_mount_opts='rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0' } - { role: nfs/client, when: env == "staging" and inventory_hostname.startswith('pkgs02'), mnt_dir: '/srv/cache/lookaside_prod', - nfs_src_dir: 'fedora_sourcecache', nfs_mount_opts='ro,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4' } + nfs_src_dir: 'fedora_sourcecache', nfs_mount_opts='ro,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0' } - role: distgit/pagure - role: distgit tags: distgit diff --git a/playbooks/groups/taskotron.yml b/playbooks/groups/taskotron.yml index bdb4c2fa5c..3197a69469 100644 --- a/playbooks/groups/taskotron.yml +++ b/playbooks/groups/taskotron.yml @@ -49,9 +49,9 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - - { role: nfs/client, mnt_dir: '/srv/taskotron/', nfs_src_dir: 'fedora_taskotron_dev', nfs_mount_opts: 'rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4,sec=sys', when: deployment_type == 'dev' } - - { role: nfs/client, mnt_dir: '/srv/taskotron/', nfs_src_dir: 'fedora_taskotron_stg', nfs_mount_opts: 'rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4,sec=sys', when: deployment_type == 'stg' } - - { role: nfs/client, mnt_dir: '/srv/taskotron/', nfs_src_dir: 'fedora_taskotron_prod', nfs_mount_opts: 'rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4,sec=sys', when: deployment_type == 'prod' } + - { role: nfs/client, mnt_dir: '/srv/taskotron/', nfs_src_dir: 'fedora_taskotron_dev', nfs_mount_opts: 'rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4.0,sec=sys', when: deployment_type == 'dev' } + - { role: nfs/client, mnt_dir: '/srv/taskotron/', nfs_src_dir: 'fedora_taskotron_stg', nfs_mount_opts: 'rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4.0,sec=sys', when: deployment_type == 'stg' } + - { role: nfs/client, mnt_dir: '/srv/taskotron/', nfs_src_dir: 'fedora_taskotron_prod', nfs_mount_opts: 'rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4.0,sec=sys', when: deployment_type == 'prod' } - { role: taskotron/grokmirror, tags: ['grokmirror'] } # - { role: taskotron/cgit, tags: ['cgit'] } - { role: taskotron/buildmaster, tags: ['buildmaster'] } diff --git a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml index 29e6fdf36a..93d866620e 100644 --- a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml +++ b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml @@ -51,7 +51,7 @@ roles: - role: nfs/client mnt_dir: '/mnt/fedora_stats' - nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" + nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4.0" nfs_src_dir: 'fedora_stats' - geoip