From 82ffbbb441b2987030b0165b98008b1df6c1eaff Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 25 May 2020 11:39:04 -0700 Subject: [PATCH] iad2: add composers to iad2 Signed-off-by: Kevin Fenzi --- .../compose-iot-01.iad2.fedoraproject.org | 37 ++++++++++ .../compose-rawhide01.iad2.fedoraproject.org | 47 +++++++++++++ .../compose-x86-01.iad2.fedoraproject.org | 67 +++++++++++++++++++ inventory/inventory | 6 ++ roles/releng/tasks/main.yml | 14 ++-- 5 files changed, 164 insertions(+), 7 deletions(-) create mode 100644 inventory/host_vars/compose-iot-01.iad2.fedoraproject.org create mode 100644 inventory/host_vars/compose-rawhide01.iad2.fedoraproject.org create mode 100644 inventory/host_vars/compose-x86-01.iad2.fedoraproject.org diff --git a/inventory/host_vars/compose-iot-01.iad2.fedoraproject.org b/inventory/host_vars/compose-iot-01.iad2.fedoraproject.org new file mode 100644 index 0000000000..c8ff83fc8b --- /dev/null +++ b/inventory/host_vars/compose-iot-01.iad2.fedoraproject.org @@ -0,0 +1,37 @@ +--- +volgroup: /dev/vg_guests +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-iad2 +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Everything/x86_64/os/ +mem_size: 32768 + +vmhost: bvmhost-x86-03.iad2.fedoraproject.org +eth0_ip: 10.3.169.122 +gw: 10.3.169.254 +main_bridge: br0 + +fas_client_groups: sysadmin-releng,sysadmin-secondary + +koji_hub_nfs: "fedora_koji" + +sudoers: "{{ private }}/files/sudo/sysadmin-secondary-sudoers" + +# This VM is the compose host for IoT Edition which isn't blocking, so it doesn't freeze +freezes: false + +fedmsg_certs: +- service: releng + owner: root + group: sysadmin-releng + can_send: + # new school pungi-koji stuff (ask dgilmore) + - pungi.compose.phase.start + - pungi.compose.phase.stop + - pungi.compose.status.change + - pungi.compose.createiso.targets + - pungi.compose.createiso.imagefail + - pungi.compose.createiso.imagedone + - pungi.compose.ostree + - compose.29.complete + - compose.29.start + - compose.29.rsync.start + - compose.29.rsync.complete diff --git a/inventory/host_vars/compose-rawhide01.iad2.fedoraproject.org b/inventory/host_vars/compose-rawhide01.iad2.fedoraproject.org new file mode 100644 index 0000000000..b3285b7158 --- /dev/null +++ b/inventory/host_vars/compose-rawhide01.iad2.fedoraproject.org @@ -0,0 +1,47 @@ +vmhost: bvmhost-x86-03.iad2.fedoraproject.org +eth0_ip: 10.3.169.123 +volgroup: /dev/vg_guests +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-iad2 +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/ + +koji_hub_nfs: "fedora_koji" + +kojipkgs_url: kojipkgs.fedoraproject.org +kojihub_url: koji.fedoraproject.org/kojihub +kojihub_scheme: https + +# rawhide is never frozen, the compose box should not be so we can make needed changes +freezes: false + +fedmsg_certs: +- service: releng + owner: root + group: sysadmin-releng + can_send: + - pungi.compose.phase.start + - pungi.compose.phase.stop + - pungi.compose.status.change + - pungi.compose.createiso.targets + - pungi.compose.createiso.imagefail + - pungi.compose.createiso.imagedone + - pungi.compose.ostree + - compose.rawhide.complete + - compose.rawhide.mash.complete + - compose.rawhide.mash.start + - compose.rawhide.image.complete + - compose.rawhide.image.start + - compose.rawhide.pungify.complete + - compose.rawhide.pungify.start + - compose.rawhide.rsync.complete + - compose.rawhide.rsync.start + - compose.rawhide.start + - compose.bikeshed.complete + - compose.bikeshed.mash.complete + - compose.bikeshed.mash.start + - compose.bikeshed.image.complete + - compose.bikeshed.image.start + - compose.bikeshed.pungify.complete + - compose.bikeshed.pungify.start + - compose.bikeshed.rsync.complete + - compose.bikeshed.rsync.start + - compose.bikeshed.start diff --git a/inventory/host_vars/compose-x86-01.iad2.fedoraproject.org b/inventory/host_vars/compose-x86-01.iad2.fedoraproject.org new file mode 100644 index 0000000000..03080f50ae --- /dev/null +++ b/inventory/host_vars/compose-x86-01.iad2.fedoraproject.org @@ -0,0 +1,67 @@ +nm: 255.255.255.0 +gw: 10.3.169.254 +dns: 10.3.163.33 + +# +# These are 64bit +# +libdir: /usr/lib64 + +ks_url: http://10.3.163.35/repo/rhel/ks/buildvm-fedora-32-iad2 +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/ + +lvm_size: 30000 + +volgroup: /dev/vg_guests +eth0_ip: 10.3.169.124 +vmhost: bvmhost-x86-04.phx2.fedoraproject.org +datacenter: iad2 + +fas_client_groups: sysadmin-releng + +koji_hub_nfs: "fedora_koji" + +kojipkgs_url: kojipkgs.fedoraproject.org +kojihub_url: koji.fedoraproject.org/kojihub +kojihub_scheme: https + +fedmsg_certs: +- service: releng + owner: root + group: sysadmin-releng + can_send: + # two-week-atomic stuff (ask maxamillion) + - releng.atomic.twoweek.begin + - releng.atomic.twoweek.complete + # new school pungi-koji stuff (ask dgilmore) + - pungi.compose.phase.start + - pungi.compose.phase.stop + - pungi.compose.status.change + - pungi.compose.createiso.targets + - pungi.compose.createiso.imagefail + - pungi.compose.createiso.imagedone + - pungi.compose.ostree + # traditional old school compose stuff + - compose.branched.complete + - compose.branched.mash.complete + - compose.branched.mash.start + - compose.branched.image.complete + - compose.branched.image.start + - compose.branched.pungify.complete + - compose.branched.pungify.start + - compose.branched.rsync.complete + - compose.branched.rsync.start + - compose.branched.start + - compose.epelbeta.complete + - compose.rawhide.complete + - compose.rawhide.mash.complete + - compose.rawhide.mash.start + - compose.rawhide.image.complete + - compose.rawhide.image.start + - compose.rawhide.pungify.complete + - compose.rawhide.pungify.start + - compose.rawhide.rsync.complete + - compose.rawhide.rsync.start + - compose.rawhide.start + - compose.29.start + - compose.29.complete diff --git a/inventory/inventory b/inventory/inventory index 14350fac1f..942cca9c92 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -22,6 +22,9 @@ compose-x86-01.phx2.fedoraproject.org branched-composer.phx2.fedoraproject.org rawhide-composer.phx2.fedoraproject.org compose-iot-01.phx2.fedoraproject.org +compose-x86-01.iad2.fedoraproject.org +compose-rawhide01.iad2.fedoraproject.org +compose-iot-01.iad2.fedoraproject.org [releng_stg] composer.stg.phx2.fedoraproject.org @@ -1285,6 +1288,8 @@ bvmhost-x86-05.iad2.fedoraproject.org bvmhost-x86-06.iad2.fedoraproject.org bvmhost-x86-07.iad2.fedoraproject.org certgetter01.iad2.fedoraproject.org +compose-x86-01.iad2.fedoraproject.org +compose-iot-01.iad2.fedoraproject.org datagrepper01.iad2.fedoraproject.org db01.iad2.fedoraproject.org db03.iad2.fedoraproject.org @@ -1336,6 +1341,7 @@ proxy110.iad2.fedoraproject.org rabbitmq01.iad2.fedoraproject.org rabbitmq02.iad2.fedoraproject.org rabbitmq03.iad2.fedoraproject.org +compose-rawhide01.iad2.fedoraproject.org secondary01.iad2.fedoraproject.org sundries01.iad2.fedoraproject.org tang01.iad2.fedoraproject.org diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml index 3eecc5ddd9..07fbf79c77 100644 --- a/roles/releng/tasks/main.yml +++ b/roles/releng/tasks/main.yml @@ -166,37 +166,37 @@ # put cron job in for branched compose - name: branched compose cron copy: src="branched" dest=/etc/cron.d/branched - when: inventory_hostname.startswith('branched-composer') + when: inventory_hostname.startswith('branched-composer.phx2') # put cron job in for rawhide compose - name: rawhide compose cron copy: src="rawhide" dest=/etc/cron.d/rawhide - when: inventory_hostname.startswith('rawhide-composer') + when: inventory_hostname.startswith('rawhide-composer.phx2') # put cron job in for cloud nightly compose - name: cloud updates compose cron copy: src="cloud-updates" dest=/etc/cron.d/cloud-updates - when: inventory_hostname.startswith('compose-x86-01') + when: inventory_hostname.startswith('compose-x86-01.phx2') # put cron job in for docker nightly compose - name: docker compose cron copy: src="container-updates" dest=/etc/cron.d/container-updates - when: inventory_hostname.startswith('compose-x86-01') + when: inventory_hostname.startswith('compose-x86-01.phx2') # put cron job in for regular ami deletion - name: clean-amis cron template: src=clean-amis.j2 dest=/etc/cron.d/clean-amis - when: inventory_hostname.startswith('compose-x86-01') + when: inventory_hostname.startswith('compose-x86-01.phx2') # put cron job in for IoT rawhide compose - name: IoT rawhide compose cron copy: src="rawhide-iot" dest=/etc/cron.d/rawhide-iot - when: inventory_hostname.startswith('compose-iot-01') + when: inventory_hostname.startswith('compose-iot-01.phx2') # put cron job in for epel8-playground compose - name: epel8-playground compose cron copy: src="epel8-playground" dest=/etc/cron.d/epel8-playground - when: inventory_hostname.startswith('branched-composer') + when: inventory_hostname.startswith('branched-composer.phx2') - name: install compose /etc/httpd/conf.d/compose.conf file copy: >