From 404430fb625c8cc1cd7b1971bb7ee1a5ccead592 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 12 Jun 2015 16:54:28 +0000 Subject: [PATCH] Setup rw fedora_koji mount on arm02-builder00, arm02-builder01, buildvm-01 and buildhw-01 These builders will be removed from other channels and added to the 'compose' channel. This requires rw rights to the koji storage. --- inventory/host_vars/arm02-builder00.arm.fedoraproject.org | 7 +++++++ inventory/host_vars/arm02-builder01.arm.fedoraproject.org | 7 +++++++ inventory/host_vars/buildhw-01.phx2.fedoraproject.org | 7 +++++++ inventory/host_vars/buildvm-01.phx2.fedoraproject.org | 7 +++++++ playbooks/groups/buildhw.yml | 2 ++ 5 files changed, 30 insertions(+) create mode 100644 inventory/host_vars/arm02-builder00.arm.fedoraproject.org create mode 100644 inventory/host_vars/arm02-builder01.arm.fedoraproject.org create mode 100644 inventory/host_vars/buildhw-01.phx2.fedoraproject.org diff --git a/inventory/host_vars/arm02-builder00.arm.fedoraproject.org b/inventory/host_vars/arm02-builder00.arm.fedoraproject.org new file mode 100644 index 0000000000..0ddade218a --- /dev/null +++ b/inventory/host_vars/arm02-builder00.arm.fedoraproject.org @@ -0,0 +1,7 @@ +--- +# +# 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=3" diff --git a/inventory/host_vars/arm02-builder01.arm.fedoraproject.org b/inventory/host_vars/arm02-builder01.arm.fedoraproject.org new file mode 100644 index 0000000000..0ddade218a --- /dev/null +++ b/inventory/host_vars/arm02-builder01.arm.fedoraproject.org @@ -0,0 +1,7 @@ +--- +# +# 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=3" diff --git a/inventory/host_vars/buildhw-01.phx2.fedoraproject.org b/inventory/host_vars/buildhw-01.phx2.fedoraproject.org new file mode 100644 index 0000000000..0ddade218a --- /dev/null +++ b/inventory/host_vars/buildhw-01.phx2.fedoraproject.org @@ -0,0 +1,7 @@ +--- +# +# 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=3" diff --git a/inventory/host_vars/buildvm-01.phx2.fedoraproject.org b/inventory/host_vars/buildvm-01.phx2.fedoraproject.org index e205b72230..de153204e4 100644 --- a/inventory/host_vars/buildvm-01.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-01.phx2.fedoraproject.org @@ -2,3 +2,10 @@ 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=3" diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 48b82cfe9b..96dea29af2 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -15,6 +15,8 @@ roles: - base - { role: nfs/client, when: inventory_hostname.startswith('build') , mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' } + - { role: nfs/client, when: inventory_hostname.startswith('arm02-builder00') , mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' } + - { role: nfs/client, when: inventory_hostname.startswith('arm02-builder01') , mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' } - { role: nfs/client, when: inventory_hostname.startswith('aarch64') , mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_arm/data' } - { role: nfs/client, when: inventory_hostname.startswith('ppc8') , mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_ppc/data' } - koji_builder