From ebdf2ac8a533889a92b96dad08164f483eb48e64 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 20 Apr 2016 21:59:49 +0000 Subject: [PATCH 1/6] roles: iscsi: mark WD drives as not multipath The new harddrive in buildvmhost-11 is not only 600GB (twice the size of its other drive), but is also from another vendor, meaning that it doesn't match the existing multipath blacklist. Signed-off-by: Patrick Uiterwijk --- roles/iscsi_client/files/multipath.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/iscsi_client/files/multipath.conf b/roles/iscsi_client/files/multipath.conf index 49bd0cbf09..0e8f7f6cac 100644 --- a/roles/iscsi_client/files/multipath.conf +++ b/roles/iscsi_client/files/multipath.conf @@ -28,6 +28,9 @@ blacklist { device { vendor "DELL" } + device { + vendor "WD" + } wwid "*GBRL0015XVEUCM*" # Blacklist the on board blade RAID controller } From 1adce100937d7949aaa99c9b2afc8bbd0da6d257 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 21 Apr 2016 14:32:08 +0000 Subject: [PATCH 2/6] Just hard code these things here for now as we always want the same in staging anyhow. --- roles/nfs/client/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/nfs/client/tasks/main.yml b/roles/nfs/client/tasks/main.yml index 49b53e0f10..e1a6ee782c 100644 --- a/roles/nfs/client/tasks/main.yml +++ b/roles/nfs/client/tasks/main.yml @@ -111,7 +111,7 @@ - name: nfs mount points (stg) staging koji mount: > name=/mnt/fedora_koji - src=10.5.126.87:/mnt/{{ nfs_src_dir }} + src=10.5.126.87:/mnt/fedora_koji fstype=nfs4 opts={{nfs_mount_opts}} passno=0 @@ -123,8 +123,8 @@ - name: nfs mount points (stg) production koji ro mount: > - name={{ mnt_dir }} - src=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com:/{{ nfs_src_dir }} + name=/mnt/fedora_koji_prod + src=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com:/fedora_koji fstype=nfs opts=ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3 passno=0 From 911f4d31527593c66a9f18d8516be22927153266 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 21 Apr 2016 14:38:11 +0000 Subject: [PATCH 3/6] Add nfs mounts for arm staging builders as they are in the compose channel. --- inventory/host_vars/arm01-builder22.arm.fedoraproject.org | 2 ++ inventory/host_vars/arm01-builder23.arm.fedoraproject.org | 2 ++ 2 files changed, 4 insertions(+) diff --git a/inventory/host_vars/arm01-builder22.arm.fedoraproject.org b/inventory/host_vars/arm01-builder22.arm.fedoraproject.org index 3da9cf3661..5ceae3687b 100644 --- a/inventory/host_vars/arm01-builder22.arm.fedoraproject.org +++ b/inventory/host_vars/arm01-builder22.arm.fedoraproject.org @@ -3,3 +3,5 @@ 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 3da9cf3661..5ceae3687b 100644 --- a/inventory/host_vars/arm01-builder23.arm.fedoraproject.org +++ b/inventory/host_vars/arm01-builder23.arm.fedoraproject.org @@ -3,3 +3,5 @@ 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" From 7ce6e7f0120ad55cb9a399a89fb9a56af8a98eab Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 21 Apr 2016 14:42:17 +0000 Subject: [PATCH 4/6] Also add exports for koji01.stg to arm builders (may need RHIT firewall changes) --- .../nfs/server/files/koji01.stg.phx2.fedoraproject.org-exports | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nfs/server/files/koji01.stg.phx2.fedoraproject.org-exports b/roles/nfs/server/files/koji01.stg.phx2.fedoraproject.org-exports index 358c0fc1ce..1609073cd9 100644 --- a/roles/nfs/server/files/koji01.stg.phx2.fedoraproject.org-exports +++ b/roles/nfs/server/files/koji01.stg.phx2.fedoraproject.org-exports @@ -1 +1 @@ -/mnt/fedora_koji 10.5.126.90(rw,no_root_squash) 10.5.126.14(rw,no_root_squash) 10.5.126.6(rw,no_root_squash) 10.5.126.169(ro) 10.5.126.223(rw,no_root_squash) 10.5.126.224(rw,no_root_squash) 10.5.126.225(rw,no_root_squash) 10.5.126.226(rw,no_root_squash) +/mnt/fedora_koji 10.5.126.90(rw,no_root_squash) 10.5.126.14(rw,no_root_squash) 10.5.126.6(rw,no_root_squash) 10.5.126.169(ro) 10.5.126.223(rw,no_root_squash) 10.5.126.224(rw,no_root_squash) 10.5.126.225(rw,no_root_squash) 10.5.126.226(rw,no_root_squash) 10.5.78.32(rw,no_root_squash) 10.5.78.33(rw,no_root_squash) From 7c8cae4659c88cf852a5edd13a87ba9f31b4221e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 21 Apr 2016 20:31:22 +0000 Subject: [PATCH 5/6] Add jenkins f23 and f24 (alpha) slaves. --- .../jenkins-slave-f23.fedorainfracloud.org | 19 +++++++++++++++++++ .../jenkins-slave-f24.fedorainfracloud.org | 19 +++++++++++++++++++ inventory/inventory | 2 ++ .../fed-cloud09.cloud.fedoraproject.org.yml | 3 ++- vars/global.yml | 1 + 5 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 inventory/host_vars/jenkins-slave-f23.fedorainfracloud.org create mode 100644 inventory/host_vars/jenkins-slave-f24.fedorainfracloud.org diff --git a/inventory/host_vars/jenkins-slave-f23.fedorainfracloud.org b/inventory/host_vars/jenkins-slave-f23.fedorainfracloud.org new file mode 100644 index 0000000000..6ba406b9b9 --- /dev/null +++ b/inventory/host_vars/jenkins-slave-f23.fedorainfracloud.org @@ -0,0 +1,19 @@ +--- +image: "{{ fedora23_x86_64 }}" +instance_type: m1.xlarge +keypair: fedora-admin-20130801 +security_group: ssh-anywhere-persistent,all-icmp-persistent,default +zone: nova +tcp_ports: [22] + +inventory_tenant: persistent +inventory_instance_name: jenkins-slave-f23 +hostbase: jenkins-slave-f23 +public_ip: 209.132.184.47 +root_auth_users: mizdebsk msrb +description: jenkins f23 builder in new cloud + +cloud_networks: + # persistent-net + - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" + diff --git a/inventory/host_vars/jenkins-slave-f24.fedorainfracloud.org b/inventory/host_vars/jenkins-slave-f24.fedorainfracloud.org new file mode 100644 index 0000000000..7ace79e531 --- /dev/null +++ b/inventory/host_vars/jenkins-slave-f24.fedorainfracloud.org @@ -0,0 +1,19 @@ +--- +image: "{{ fedora24_alpha_x86_64 }}" +instance_type: m1.xlarge +keypair: fedora-admin-20130801 +security_group: ssh-anywhere-persistent,all-icmp-persistent,default +zone: nova +tcp_ports: [22] + +inventory_tenant: persistent +inventory_instance_name: jenkins-slave-f24 +hostbase: jenkins-slave-f24 +public_ip: 209.132.184.237 +root_auth_users: mizdebsk msrb +description: jenkins f24 builder in new cloud + +cloud_networks: + # persistent-net + - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" + diff --git a/inventory/inventory b/inventory/inventory index 35a6c2ca23..c5fec18acc 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1041,6 +1041,8 @@ jenkins.fedorainfracloud.org jenkins-slave-el6.fedorainfracloud.org jenkins-slave-el7.fedorainfracloud.org jenkins-slave-f22.fedorainfracloud.org +jenkins-slave-f23.fedorainfracloud.org +jenkins-slave-f24.fedorainfracloud.org [osuosl] proxy06.fedoraproject.org diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml index 337f6292cc..cd03b6c166 100644 --- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml @@ -641,7 +641,8 @@ copy_from: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1503.qcow2 - name: CentOS-6-x86_64-GenericCloud-20141129_01 copy_from: http://cloud.centos.org/centos/6/images/CentOS-6-x86_64-GenericCloud-20141129_01.qcow2 - + - name: Fedora-Cloud-Base-24_Alpha-7.x86_64.qcow2 + copy_from: http://dl.fedoraproject.org/pub/fedora/linux/releases/test/24_Alpha/CloudImages/x86_64/images/Fedora-Cloud-Base-24_Alpha-7.x86_64.qcow2 # RHEL6 can be downloaded from https://rhn.redhat.com/rhn/software/channel/downloads/Download.do?cid=16952 - stat: path=/root/images/rhel-guest-image-6.6-20141222.0.x86_64.qcow2 register: rhel6_image diff --git a/vars/global.yml b/vars/global.yml index 0510713006..d62055463c 100644 --- a/vars/global.yml +++ b/vars/global.yml @@ -39,6 +39,7 @@ fedora_atomic_22_alpha: Fedora-Cloud-Atomic-22_Alpha-20150305.x86_64 fedora_atomic_22_beta: Fedora-Cloud-Atomic-22_Beta-20150415.x86_64 fedora_atomic_22: Fedora-Cloud-Atomic-22-20150521.x86_64 fedora23_x86_64: Fedora-Cloud-Base-23-20151030.x86_64 +fedora24_alpha_x86_64: Fedora-Cloud-Base-24_Alpha-7.x86_64.qcow2 centos70_x86_64: CentOS-7-x86_64-GenericCloud-1503 centos66_x86_64: CentOS-6-x86_64-GenericCloud-20141129_01 rhel70_x86_64: rhel-guest-image-7.0-20140930.0.x86_64 From 4a1499fe61df0550b25adf054adaf0012a0ca698 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 21 Apr 2016 21:41:57 +0000 Subject: [PATCH 6/6] Don't install fedora repo files on jenkins-slave-f24 because it's a pre-release --- tasks/yumrepos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml index e2be10b05b..74affb986e 100644 --- a/tasks/yumrepos.yml +++ b/tasks/yumrepos.yml @@ -21,7 +21,7 @@ - fedora.repo - fedora-updates.repo - fedora-updates-testing.repo - when: ansible_distribution == 'Fedora' and (ansible_architecture == 'x86_64' or ansible_architecture == 'i386' or ansible_architecture == 'armv7l') and not inventory_hostname.startswith('arm03') + when: ansible_distribution == 'Fedora' and (ansible_architecture == 'x86_64' or ansible_architecture == 'i386' or ansible_architecture == 'armv7l') and not inventory_hostname.startswith('arm03') and not inventory_hostname.startswith('jenkins-slave-f24') tags: - config - packages