commit a6907e5d37ecd12416d8f9b13122159c29f5e599 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Wed May 13 14:27:59 2020 +0200 Remove more deprecated options inventory/group_vars/all | 2 +- inventory/group_vars/bodhi_backend | 2 +- inventory/group_vars/releng_compose | 2 +- .../host_vars/arm-builder01.scaleway.rpmfusion.net | 2 +- .../host_vars/arm-builder02.scaleway.rpmfusion.net | 2 +- .../host_vars/arm-builder03.scaleway.rpmfusion.net | 2 +- .../host_vars/arm-builder04.scaleway.rpmfusion.net | 2 +- inventory/host_vars/bastion03.virt.rpmfusion.net | 2 +- .../host_vars/buildvm-01.online.rpmfusion.net | 2 +- .../host_vars/buildvm-02.online.rpmfusion.net | 2 +- .../host_vars/buildvm-03.online.rpmfusion.net | 2 +- inventory/host_vars/buildvm-07.virt.rpmfusion.net | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) --- diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 54d51b0..3d0c648 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -219,7 +219,7 @@ env_suffix: env_short: prod # 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,noatime,nodev,nosuid,nfsvers=3" # 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/bodhi_backend b/inventory/group_vars/bodhi_backend index 870b606..bc34834 100644 --- a/inventory/group_vars/bodhi_backend +++ b/inventory/group_vars/bodhi_backend @@ -34,7 +34,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=3" +nfs_mount_opts: "rw,hard,bg,noatime,nodev,nosuid,sec=sys,nfsvers=3" fas_client_groups: sysadmin-releng,sysadmin-bodhi sudoers: "{{ private }}/files/sudo/00releng-sudoers" diff --git a/inventory/group_vars/releng_compose b/inventory/group_vars/releng_compose index cfe2376..df8fd65 100644 --- a/inventory/group_vars/releng_compose +++ b/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=4" +nfs_mount_opts: "rw,hard,bg,noatime,nodev,nosuid,nfsvers=4" # For the mock config kojipkgs_url: koji.rpmfusion.org/kojifiles diff --git a/inventory/host_vars/arm-builder01.scaleway.rpmfusion.net b/inventory/host_vars/arm-builder01.scaleway.rpmfusion.net index 0fa01d5..865c9a0 100644 --- a/inventory/host_vars/arm-builder01.scaleway.rpmfusion.net +++ b/inventory/host_vars/arm-builder01.scaleway.rpmfusion.net @@ -6,4 +6,4 @@ eth0_ip: 192.168.182.101 # 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,noatime,nodev,nosuid,nfsvers=3" diff --git a/inventory/host_vars/arm-builder02.scaleway.rpmfusion.net b/inventory/host_vars/arm-builder02.scaleway.rpmfusion.net index 2c3f484..b71018d 100644 --- a/inventory/host_vars/arm-builder02.scaleway.rpmfusion.net +++ b/inventory/host_vars/arm-builder02.scaleway.rpmfusion.net @@ -6,4 +6,4 @@ eth0_ip: 192.168.182.102 # 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,noatime,nodev,nosuid,nfsvers=3" diff --git a/inventory/host_vars/arm-builder03.scaleway.rpmfusion.net b/inventory/host_vars/arm-builder03.scaleway.rpmfusion.net index 0fa01d5..865c9a0 100644 --- a/inventory/host_vars/arm-builder03.scaleway.rpmfusion.net +++ b/inventory/host_vars/arm-builder03.scaleway.rpmfusion.net @@ -6,4 +6,4 @@ eth0_ip: 192.168.182.101 # 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,noatime,nodev,nosuid,nfsvers=3" diff --git a/inventory/host_vars/arm-builder04.scaleway.rpmfusion.net b/inventory/host_vars/arm-builder04.scaleway.rpmfusion.net index 0fa01d5..865c9a0 100644 --- a/inventory/host_vars/arm-builder04.scaleway.rpmfusion.net +++ b/inventory/host_vars/arm-builder04.scaleway.rpmfusion.net @@ -6,4 +6,4 @@ eth0_ip: 192.168.182.101 # 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,noatime,nodev,nosuid,nfsvers=3" diff --git a/inventory/host_vars/bastion03.virt.rpmfusion.net b/inventory/host_vars/bastion03.virt.rpmfusion.net index 970d09b..986b2ef 100644 --- a/inventory/host_vars/bastion03.virt.rpmfusion.net +++ b/inventory/host_vars/bastion03.virt.rpmfusion.net @@ -19,4 +19,4 @@ custom_rules: [ ] # 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,noatime,nodev,nosuid,nfsvers=3" diff --git a/inventory/host_vars/buildvm-01.online.rpmfusion.net b/inventory/host_vars/buildvm-01.online.rpmfusion.net index 87c22c3..effde90 100644 --- a/inventory/host_vars/buildvm-01.online.rpmfusion.net +++ b/inventory/host_vars/buildvm-01.online.rpmfusion.net @@ -8,4 +8,4 @@ ks_url: http://192.168.181.254/install/ks/buildvm-01.ks # 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,noatime,nodev,nosuid,nfsvers=3" diff --git a/inventory/host_vars/buildvm-02.online.rpmfusion.net b/inventory/host_vars/buildvm-02.online.rpmfusion.net index 56f3209..a9615a8 100644 --- a/inventory/host_vars/buildvm-02.online.rpmfusion.net +++ b/inventory/host_vars/buildvm-02.online.rpmfusion.net @@ -8,4 +8,4 @@ ks_url: http://192.168.181.254/install/ks/buildvm-02.ks # 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,noatime,nodev,nosuid,nfsvers=3" diff --git a/inventory/host_vars/buildvm-03.online.rpmfusion.net b/inventory/host_vars/buildvm-03.online.rpmfusion.net index f97c368..7f22796 100644 --- a/inventory/host_vars/buildvm-03.online.rpmfusion.net +++ b/inventory/host_vars/buildvm-03.online.rpmfusion.net @@ -10,4 +10,4 @@ datacenter: virt # 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,noatime,nodev,nosuid,nfsvers=3" diff --git a/inventory/host_vars/buildvm-07.virt.rpmfusion.net b/inventory/host_vars/buildvm-07.virt.rpmfusion.net index 6720b95..4650404 100644 --- a/inventory/host_vars/buildvm-07.virt.rpmfusion.net +++ b/inventory/host_vars/buildvm-07.virt.rpmfusion.net @@ -6,4 +6,4 @@ datacenter: virt # 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,noatime,nodev,nosuid,nfsvers=3"