From 9eb4f54ac0e917dbb916d07d2947180a5f76e8f1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 12 May 2016 08:40:11 +0000 Subject: [PATCH] runroot: add grooup and move RW nfs option there so it's consistent --- inventory/group_vars/runroot | 6 ++++++ inventory/host_vars/aarch64-02a.arm.fedoraproject.org | 2 -- inventory/host_vars/arm01-builder22.arm.fedoraproject.org | 1 - inventory/host_vars/arm01-builder23.arm.fedoraproject.org | 1 - inventory/host_vars/arm02-builder21.arm.fedoraproject.org | 6 ------ inventory/host_vars/arm02-builder23.arm.fedoraproject.org | 6 ------ inventory/host_vars/arm04-builder00.arm.fedoraproject.org | 6 ------ inventory/host_vars/arm04-builder01.arm.fedoraproject.org | 6 ------ inventory/host_vars/buildhw-01.phx2.fedoraproject.org | 7 ------- inventory/host_vars/buildvm-01.phx2.fedoraproject.org | 7 ------- 10 files changed, 6 insertions(+), 42 deletions(-) create mode 100644 inventory/group_vars/runroot diff --git a/inventory/group_vars/runroot b/inventory/group_vars/runroot new file mode 100644 index 0000000000..ffe0c39244 --- /dev/null +++ b/inventory/group_vars/runroot @@ -0,0 +1,6 @@ +--- + +# 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,nfsvers=4" diff --git a/inventory/host_vars/aarch64-02a.arm.fedoraproject.org b/inventory/host_vars/aarch64-02a.arm.fedoraproject.org index 86bb4b3e9c..fce320e99a 100644 --- a/inventory/host_vars/aarch64-02a.arm.fedoraproject.org +++ b/inventory/host_vars/aarch64-02a.arm.fedoraproject.org @@ -10,8 +10,6 @@ koji_server_url: "http://arm.koji.fedoraproject.org/kojihub" koji_weburl: "http://arm.koji.fedoraproject.org/koji" koji_topurl: "http://armpkgs.fedoraproject.org/" -nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4 - fedmsg_certs: - service: releng owner: root diff --git a/inventory/host_vars/arm01-builder22.arm.fedoraproject.org b/inventory/host_vars/arm01-builder22.arm.fedoraproject.org index 5ceae3687b..d125b4280c 100644 --- a/inventory/host_vars/arm01-builder22.arm.fedoraproject.org +++ b/inventory/host_vars/arm01-builder22.arm.fedoraproject.org @@ -3,5 +3,4 @@ koji_server_url: "http://koji.stg.fedoraproject.org/kojihub" koji_weburl: "http://koji.stg.fedoraproject.org/koji" koji_topurl: "http://kojipkgs.stg.fedoraproject.org/" datacenter: staging -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid" koji_hub_nfs: "fedora_koji" diff --git a/inventory/host_vars/arm01-builder23.arm.fedoraproject.org b/inventory/host_vars/arm01-builder23.arm.fedoraproject.org index 5ceae3687b..d125b4280c 100644 --- a/inventory/host_vars/arm01-builder23.arm.fedoraproject.org +++ b/inventory/host_vars/arm01-builder23.arm.fedoraproject.org @@ -3,5 +3,4 @@ koji_server_url: "http://koji.stg.fedoraproject.org/kojihub" koji_weburl: "http://koji.stg.fedoraproject.org/koji" koji_topurl: "http://kojipkgs.stg.fedoraproject.org/" datacenter: staging -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid" koji_hub_nfs: "fedora_koji" diff --git a/inventory/host_vars/arm02-builder21.arm.fedoraproject.org b/inventory/host_vars/arm02-builder21.arm.fedoraproject.org index 8010701e3a..2eeeeff96d 100644 --- a/inventory/host_vars/arm02-builder21.arm.fedoraproject.org +++ b/inventory/host_vars/arm02-builder21.arm.fedoraproject.org @@ -1,8 +1,2 @@ --- -# -# 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,nfsvers=4" koji_hub_nfs: "fedora_koji" diff --git a/inventory/host_vars/arm02-builder23.arm.fedoraproject.org b/inventory/host_vars/arm02-builder23.arm.fedoraproject.org index 8010701e3a..2eeeeff96d 100644 --- a/inventory/host_vars/arm02-builder23.arm.fedoraproject.org +++ b/inventory/host_vars/arm02-builder23.arm.fedoraproject.org @@ -1,8 +1,2 @@ --- -# -# 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,nfsvers=4" koji_hub_nfs: "fedora_koji" diff --git a/inventory/host_vars/arm04-builder00.arm.fedoraproject.org b/inventory/host_vars/arm04-builder00.arm.fedoraproject.org index 8010701e3a..2eeeeff96d 100644 --- a/inventory/host_vars/arm04-builder00.arm.fedoraproject.org +++ b/inventory/host_vars/arm04-builder00.arm.fedoraproject.org @@ -1,8 +1,2 @@ --- -# -# 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,nfsvers=4" koji_hub_nfs: "fedora_koji" diff --git a/inventory/host_vars/arm04-builder01.arm.fedoraproject.org b/inventory/host_vars/arm04-builder01.arm.fedoraproject.org index 8010701e3a..2eeeeff96d 100644 --- a/inventory/host_vars/arm04-builder01.arm.fedoraproject.org +++ b/inventory/host_vars/arm04-builder01.arm.fedoraproject.org @@ -1,8 +1,2 @@ --- -# -# 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,nfsvers=4" koji_hub_nfs: "fedora_koji" diff --git a/inventory/host_vars/buildhw-01.phx2.fedoraproject.org b/inventory/host_vars/buildhw-01.phx2.fedoraproject.org index c9931d0b08..efeb1807fb 100644 --- a/inventory/host_vars/buildhw-01.phx2.fedoraproject.org +++ b/inventory/host_vars/buildhw-01.phx2.fedoraproject.org @@ -1,11 +1,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,nfsvers=4" - gw: 10.5.125.254 eth0_ip: 10.5.125.94 eth1_ip: 10.5.127.154 diff --git a/inventory/host_vars/buildvm-01.phx2.fedoraproject.org b/inventory/host_vars/buildvm-01.phx2.fedoraproject.org index 7ddaec5ce3..e205b72230 100644 --- a/inventory/host_vars/buildvm-01.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-01.phx2.fedoraproject.org @@ -2,10 +2,3 @@ vmhost: buildvmhost-10.phx2.fedoraproject.org eth0_ip: 10.5.125.98 eth1_ip: 10.5.127.158 - -# -# 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,nfsvers=4"