From 159161051314cbe19486e4a905a21c11a4787dcc Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 15 Jan 2018 22:17:09 +0100 Subject: [PATCH 01/15] copr-backend-stg: install python-novaclient-3.3.1-3.fc25 --- roles/copr/backend/tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index 90f90f9fad..38f893b14d 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -17,6 +17,7 @@ - name: install the latest copr-backend from f26 command: dnf install -y https://kojipkgs.fedoraproject.org//packages/copr-backend/1.110/1.fc26/noarch/copr-backend-1.110-1.fc26.noarch.rpm + when: env != "staging" - name: add additional packages for copr-backend dnf: state=present name={{ item }} @@ -27,6 +28,10 @@ - python-keystoneclient - php-cli +- name: install python2-novaclient version that actually works with the current OpenStack deployment + command: dnf install -y https://kojipkgs.fedoraproject.org/packages/python-novaclient/3.3.1/3.fc25/noarch/python2-novaclient-3.3.1-3.fc25.noarch.rpm + when: env == "staging" + - name: make copr dirs file: state=directory path={{ item }} with_items: From e0cb07319c815192d990a10b4f4b25f91109cc88 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 15 Jan 2018 22:02:51 +0000 Subject: [PATCH 02/15] put buildvm-ppc64 01-05 on ppc8-01 --- inventory/host_vars/buildvm-ppc64-02.ppc.fedoraproject.org | 2 +- inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory/host_vars/buildvm-ppc64-02.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-02.ppc.fedoraproject.org index a3d190605b..012e0ba5ce 100644 --- a/inventory/host_vars/buildvm-ppc64-02.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-02.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-02.ppc.fedoraproject.org +vmhost: ppc8-01.ppc.fedoraproject.org eth0_ip: 10.5.129.88 eth1_ip: 10.5.127.10 diff --git a/inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org index d9159e8f1c..894fcd8524 100644 --- a/inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-03.ppc.fedoraproject.org +vmhost: ppc8-01.ppc.fedoraproject.org eth0_ip: 10.5.129.91 eth1_ip: 10.5.127.117 From 4567fd57b61c4783dc6693db4a9c82acd976135d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 15 Jan 2018 22:05:37 +0000 Subject: [PATCH 03/15] buildvm-ppc64le 01-05 to ppc8-01 too --- inventory/host_vars/buildvm-ppc64le-02.ppc.fedoraproject.org | 2 +- inventory/host_vars/buildvm-ppc64le-03.ppc.fedoraproject.org | 2 +- inventory/host_vars/buildvm-ppc64le-04.ppc.fedoraproject.org | 2 +- inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inventory/host_vars/buildvm-ppc64le-02.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-02.ppc.fedoraproject.org index bac3b898fa..6a76c9548a 100644 --- a/inventory/host_vars/buildvm-ppc64le-02.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-02.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-02.ppc.fedoraproject.org +vmhost: ppc8-01.ppc.fedoraproject.org eth0_ip: 10.5.129.73 eth1_ip: 10.5.127.52 diff --git a/inventory/host_vars/buildvm-ppc64le-03.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-03.ppc.fedoraproject.org index bd72e0a0ae..b56a888511 100644 --- a/inventory/host_vars/buildvm-ppc64le-03.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-03.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-02.ppc.fedoraproject.org +vmhost: ppc8-01.ppc.fedoraproject.org eth0_ip: 10.5.129.74 eth1_ip: 10.5.127.121 diff --git a/inventory/host_vars/buildvm-ppc64le-04.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-04.ppc.fedoraproject.org index bc1b39080d..30c327a025 100644 --- a/inventory/host_vars/buildvm-ppc64le-04.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-04.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-03.ppc.fedoraproject.org +vmhost: ppc8-01.ppc.fedoraproject.org eth0_ip: 10.5.129.75 eth1_ip: 10.5.127.122 diff --git a/inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org index d8aee6e901..ee47c1dba0 100644 --- a/inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-03.ppc.fedoraproject.org +vmhost: ppc8-01.ppc.fedoraproject.org eth0_ip: 10.5.129.76 eth1_ip: 10.5.127.135 From 084801fc5580f4581d3c91fe472d70a2a0c1726b Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mon, 15 Jan 2018 22:23:57 +0000 Subject: [PATCH 04/15] Rather than hard sleep 45, use curl retry Signed-off-by: Patrick Uiterwijk --- .../mirrorlist_proxy/files/restart-mirrorlist-containers | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/mirrormanager/mirrorlist_proxy/files/restart-mirrorlist-containers b/roles/mirrormanager/mirrorlist_proxy/files/restart-mirrorlist-containers index a8438d9067..fdf5385412 100644 --- a/roles/mirrormanager/mirrorlist_proxy/files/restart-mirrorlist-containers +++ b/roles/mirrormanager/mirrorlist_proxy/files/restart-mirrorlist-containers @@ -30,8 +30,8 @@ fi systemctl start mirrorlist2 echo "enable server mirror-lists/mirrorlist-local2" | nc -U /var/run/haproxy-admin >& /dev/null -sleep 45 -curl -q -H mirrors.fedoraproject.org "http://localhost:18082/metalink?repo=rawhide&arch=x86_64" -o/dev/null -s -f +sleep 5 +curl -q -H mirrors.fedoraproject.org "http://localhost:18082/metalink?repo=rawhide&arch=x86_64" -o/dev/null -s -f --retry 50 --retry-delay 10 --retry-connrefused --retry-max-time 180 if [ $? != 0 ]; then echo "ERROR: mirrorlist2 did not start correctly" exit 1 @@ -46,8 +46,8 @@ systemctl restart mirrorlist1 sleep 1 echo "enable server mirror-lists/mirrorlist-local1" | nc -U /var/run/haproxy-admin >& /dev/null -sleep 45 -curl -q -H mirrors.fedoraproject.org "http://localhost:18081/metalink?repo=rawhide&arch=x86_64" -o/dev/null -s -f +sleep 5 +curl -q -H mirrors.fedoraproject.org "http://localhost:18081/metalink?repo=rawhide&arch=x86_64" -o/dev/null -s -f --retry 50 --retry-delay 10 --retry-connrefused --retry-max-time 180 if [ $? != 0 ]; then echo "ERROR: mirrorlist1 did not restart correctly" exit 1 From 91561ec3659e31cc2762cad7a014d6f007d206de Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 15 Jan 2018 22:27:52 +0000 Subject: [PATCH 05/15] move to f27 and shave a bit of disk off to allow all to fit --- inventory/group_vars/buildvm-ppc64 | 6 +++--- inventory/group_vars/buildvm-ppc64le | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/inventory/group_vars/buildvm-ppc64 b/inventory/group_vars/buildvm-ppc64 index 0091a0c762..14cedbf3cf 100644 --- a/inventory/group_vars/buildvm-ppc64 +++ b/inventory/group_vars/buildvm-ppc64 @@ -1,12 +1,12 @@ --- # common items for the buildvm-* koji builders volgroup: /dev/vg_guests -lvm_size: 150000 +lvm_size: 145000 mem_size: 10240 max_mem_size: "{{ mem_size }}" num_cpus: 4 -ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-26-ppc64 -ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/26/Server/ppc64/os/ +ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-27-ppc64 +ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/27/Server/ppc64/os/ nm: 255.255.255.0 gw: 10.5.129.254 dns: 10.5.126.21 diff --git a/inventory/group_vars/buildvm-ppc64le b/inventory/group_vars/buildvm-ppc64le index a7459bbbe7..375cf41cba 100644 --- a/inventory/group_vars/buildvm-ppc64le +++ b/inventory/group_vars/buildvm-ppc64le @@ -1,12 +1,12 @@ --- # common items for the buildvm-* koji builders volgroup: /dev/vg_guests -lvm_size: 150000 +lvm_size: 145000 mem_size: 10240 max_mem_size: "{{ mem_size }}" num_cpus: 4 -ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-26-ppc64le -ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/26/Server/ppc64le/os/ +ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-27-ppc64le +ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/27/Server/ppc64le/os/ nm: 255.255.255.0 gw: 10.5.129.254 dns: 10.5.126.21 From b095ece2407cb07e70499003f3cf42fd4811583b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 15 Jan 2018 22:56:12 +0000 Subject: [PATCH 06/15] move 05 to the next virthost --- inventory/group_vars/buildvm-ppc64 | 2 +- inventory/group_vars/buildvm-ppc64le | 2 +- inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org | 2 +- inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/buildvm-ppc64 b/inventory/group_vars/buildvm-ppc64 index 14cedbf3cf..3840fec2e4 100644 --- a/inventory/group_vars/buildvm-ppc64 +++ b/inventory/group_vars/buildvm-ppc64 @@ -1,7 +1,7 @@ --- # common items for the buildvm-* koji builders volgroup: /dev/vg_guests -lvm_size: 145000 +lvm_size: 150000 mem_size: 10240 max_mem_size: "{{ mem_size }}" num_cpus: 4 diff --git a/inventory/group_vars/buildvm-ppc64le b/inventory/group_vars/buildvm-ppc64le index 375cf41cba..11d09c4f2b 100644 --- a/inventory/group_vars/buildvm-ppc64le +++ b/inventory/group_vars/buildvm-ppc64le @@ -1,7 +1,7 @@ --- # common items for the buildvm-* koji builders volgroup: /dev/vg_guests -lvm_size: 145000 +lvm_size: 150000 mem_size: 10240 max_mem_size: "{{ mem_size }}" num_cpus: 4 diff --git a/inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org index 894fcd8524..eb2f066b4d 100644 --- a/inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-01.ppc.fedoraproject.org +vmhost: ppc8-02.ppc.fedoraproject.org eth0_ip: 10.5.129.91 eth1_ip: 10.5.127.117 diff --git a/inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org index ee47c1dba0..1b714acfc6 100644 --- a/inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-01.ppc.fedoraproject.org +vmhost: ppc8-02.ppc.fedoraproject.org eth0_ip: 10.5.129.76 eth1_ip: 10.5.127.135 From 7033f1e1b7f0d71ff890c7ff336e773fde5a766d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 15 Jan 2018 23:19:54 +0000 Subject: [PATCH 07/15] Revert "move 05 to the next virthost" This reverts commit b095ece2407cb07e70499003f3cf42fd4811583b. --- inventory/group_vars/buildvm-ppc64 | 2 +- inventory/group_vars/buildvm-ppc64le | 2 +- inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org | 2 +- inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/buildvm-ppc64 b/inventory/group_vars/buildvm-ppc64 index 3840fec2e4..14cedbf3cf 100644 --- a/inventory/group_vars/buildvm-ppc64 +++ b/inventory/group_vars/buildvm-ppc64 @@ -1,7 +1,7 @@ --- # common items for the buildvm-* koji builders volgroup: /dev/vg_guests -lvm_size: 150000 +lvm_size: 145000 mem_size: 10240 max_mem_size: "{{ mem_size }}" num_cpus: 4 diff --git a/inventory/group_vars/buildvm-ppc64le b/inventory/group_vars/buildvm-ppc64le index 11d09c4f2b..375cf41cba 100644 --- a/inventory/group_vars/buildvm-ppc64le +++ b/inventory/group_vars/buildvm-ppc64le @@ -1,7 +1,7 @@ --- # common items for the buildvm-* koji builders volgroup: /dev/vg_guests -lvm_size: 150000 +lvm_size: 145000 mem_size: 10240 max_mem_size: "{{ mem_size }}" num_cpus: 4 diff --git a/inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org index eb2f066b4d..894fcd8524 100644 --- a/inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-02.ppc.fedoraproject.org +vmhost: ppc8-01.ppc.fedoraproject.org eth0_ip: 10.5.129.91 eth1_ip: 10.5.127.117 diff --git a/inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org index 1b714acfc6..ee47c1dba0 100644 --- a/inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-05.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-02.ppc.fedoraproject.org +vmhost: ppc8-01.ppc.fedoraproject.org eth0_ip: 10.5.129.76 eth1_ip: 10.5.127.135 From 293f255fc26fc3c962f10ae88aa7dbe91a57c8cc Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 16 Jan 2018 00:20:19 +0000 Subject: [PATCH 08/15] move around more ppc buildvms --- inventory/host_vars/buildvm-ppc64-07.ppc.fedoraproject.org | 2 +- inventory/host_vars/buildvm-ppc64-08.ppc.fedoraproject.org | 2 +- inventory/host_vars/buildvm-ppc64-09.ppc.fedoraproject.org | 2 +- inventory/host_vars/buildvm-ppc64le-07.ppc.fedoraproject.org | 2 +- inventory/host_vars/buildvm-ppc64le-08.ppc.fedoraproject.org | 2 +- inventory/host_vars/buildvm-ppc64le-09.ppc.fedoraproject.org | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/inventory/host_vars/buildvm-ppc64-07.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-07.ppc.fedoraproject.org index e79a0e5404..94443b2e83 100644 --- a/inventory/host_vars/buildvm-ppc64-07.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-07.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-03.ppc.fedoraproject.org +vmhost: ppc8-02.ppc.fedoraproject.org eth0_ip: 10.5.129.93 eth1_ip: 10.5.127.140 diff --git a/inventory/host_vars/buildvm-ppc64-08.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-08.ppc.fedoraproject.org index c22aa796e1..8a1c52f93f 100644 --- a/inventory/host_vars/buildvm-ppc64-08.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-08.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-01.ppc.fedoraproject.org +vmhost: ppc8-02.ppc.fedoraproject.org eth0_ip: 10.5.129.94 eth1_ip: 10.5.127.141 diff --git a/inventory/host_vars/buildvm-ppc64-09.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-09.ppc.fedoraproject.org index 8de6289dde..6e1529de28 100644 --- a/inventory/host_vars/buildvm-ppc64-09.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-09.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-03.ppc.fedoraproject.org +vmhost: ppc8-02.ppc.fedoraproject.org eth0_ip: 10.5.129.95 eth1_ip: 10.5.127.142 diff --git a/inventory/host_vars/buildvm-ppc64le-07.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-07.ppc.fedoraproject.org index 3c13bc0d20..b025bdd127 100644 --- a/inventory/host_vars/buildvm-ppc64le-07.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-07.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-03.ppc.fedoraproject.org +vmhost: ppc8-02.ppc.fedoraproject.org eth0_ip: 10.5.129.78 eth1_ip: 10.5.127.107 diff --git a/inventory/host_vars/buildvm-ppc64le-08.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-08.ppc.fedoraproject.org index e1019fb43f..7d581c3764 100644 --- a/inventory/host_vars/buildvm-ppc64le-08.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-08.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-01.ppc.fedoraproject.org +vmhost: ppc8-02.ppc.fedoraproject.org eth0_ip: 10.5.129.79 eth1_ip: 10.5.127.108 diff --git a/inventory/host_vars/buildvm-ppc64le-09.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-09.ppc.fedoraproject.org index 58083d26e8..725d59fd5d 100644 --- a/inventory/host_vars/buildvm-ppc64le-09.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-09.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-03.ppc.fedoraproject.org +vmhost: ppc8-02.ppc.fedoraproject.org eth0_ip: 10.5.129.84 eth1_ip: 10.5.127.109 From 198ca55a6d56e57d245536a23ae3a159cbb17909 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 16 Jan 2018 01:14:18 +0000 Subject: [PATCH 09/15] move some more ppc64s around --- inventory/host_vars/buildvm-ppc64-10.ppc.fedoraproject.org | 2 +- inventory/host_vars/buildvm-ppc64-11.ppc.fedoraproject.org | 3 +-- inventory/host_vars/buildvm-ppc64-12.ppc.fedoraproject.org | 3 +-- inventory/host_vars/buildvm-ppc64-13.ppc.fedoraproject.org | 3 +-- inventory/host_vars/buildvm-ppc64le-10.ppc.fedoraproject.org | 2 +- inventory/host_vars/buildvm-ppc64le-11.ppc.fedoraproject.org | 3 +-- inventory/host_vars/buildvm-ppc64le-12.ppc.fedoraproject.org | 3 +-- inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org | 3 +-- 8 files changed, 8 insertions(+), 14 deletions(-) diff --git a/inventory/host_vars/buildvm-ppc64-10.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-10.ppc.fedoraproject.org index 8d7e2c4007..a6da3e2287 100644 --- a/inventory/host_vars/buildvm-ppc64-10.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-10.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-02.ppc.fedoraproject.org +vmhost: ppc8-03.ppc.fedoraproject.org eth0_ip: 10.5.129.96 eth1_ip: 10.5.127.143 diff --git a/inventory/host_vars/buildvm-ppc64-11.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-11.ppc.fedoraproject.org index 70345434f7..eb2dabe486 100644 --- a/inventory/host_vars/buildvm-ppc64-11.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-11.ppc.fedoraproject.org @@ -1,5 +1,4 @@ --- -vmhost: ppc8-04.ppc.fedoraproject.org +vmhost: ppc8-03.ppc.fedoraproject.org eth0_ip: 10.5.129.97 eth1_ip: 10.5.127.118 -createrepo: False diff --git a/inventory/host_vars/buildvm-ppc64-12.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-12.ppc.fedoraproject.org index 358468995e..c38cd58f9d 100644 --- a/inventory/host_vars/buildvm-ppc64-12.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-12.ppc.fedoraproject.org @@ -1,5 +1,4 @@ --- -vmhost: ppc8-04.ppc.fedoraproject.org +vmhost: ppc8-03.ppc.fedoraproject.org eth0_ip: 10.5.129.98 eth1_ip: 10.5.127.119 -createrepo: False diff --git a/inventory/host_vars/buildvm-ppc64-13.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-13.ppc.fedoraproject.org index ef39556995..2a2d5c62d3 100644 --- a/inventory/host_vars/buildvm-ppc64-13.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-13.ppc.fedoraproject.org @@ -1,5 +1,4 @@ --- -vmhost: ppc8-04.ppc.fedoraproject.org +vmhost: ppc8-03.ppc.fedoraproject.org eth0_ip: 10.5.129.99 eth1_ip: 10.5.127.120 -createrepo: False diff --git a/inventory/host_vars/buildvm-ppc64le-10.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-10.ppc.fedoraproject.org index 94a9c2b703..2ccc1db278 100644 --- a/inventory/host_vars/buildvm-ppc64le-10.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-10.ppc.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: ppc8-02.ppc.fedoraproject.org +vmhost: ppc8-03.ppc.fedoraproject.org eth0_ip: 10.5.129.85 eth1_ip: 10.5.127.110 diff --git a/inventory/host_vars/buildvm-ppc64le-11.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-11.ppc.fedoraproject.org index 98c9e0d76e..3d2b9a89fe 100644 --- a/inventory/host_vars/buildvm-ppc64le-11.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-11.ppc.fedoraproject.org @@ -1,5 +1,4 @@ --- -vmhost: ppc8-04.ppc.fedoraproject.org +vmhost: ppc8-03.ppc.fedoraproject.org eth0_ip: 10.5.129.82 eth1_ip: 10.5.127.136 -createrepo: False diff --git a/inventory/host_vars/buildvm-ppc64le-12.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-12.ppc.fedoraproject.org index f83d23a617..2fd073a246 100644 --- a/inventory/host_vars/buildvm-ppc64le-12.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-12.ppc.fedoraproject.org @@ -1,5 +1,4 @@ --- -vmhost: ppc8-04.ppc.fedoraproject.org +vmhost: ppc8-03.ppc.fedoraproject.org eth0_ip: 10.5.129.83 eth1_ip: 10.5.127.137 -createrepo: False diff --git a/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org index cc83b33974..c1c8bbc683 100644 --- a/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org @@ -1,5 +1,4 @@ --- -vmhost: ppc8-04.ppc.fedoraproject.org +vmhost: ppc8-03.ppc.fedoraproject.org eth0_ip: 10.5.129.86 eth1_ip: 10.5.127.138 -createrepo: False From 176c8e09e4f87b2954b36485e882e892298d0316 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 16 Jan 2018 01:17:08 +0000 Subject: [PATCH 10/15] add a 14 of each kind --- inventory/builders | 2 ++ inventory/host_vars/buildvm-ppc64-14.ppc.fedoraproject.org | 4 ++++ inventory/host_vars/buildvm-ppc64le-14.ppc.fedoraproject.org | 4 ++++ 3 files changed, 10 insertions(+) create mode 100644 inventory/host_vars/buildvm-ppc64-14.ppc.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-ppc64le-14.ppc.fedoraproject.org diff --git a/inventory/builders b/inventory/builders index efffda30de..d262d3a749 100644 --- a/inventory/builders +++ b/inventory/builders @@ -202,6 +202,7 @@ buildvm-ppc64-10.ppc.fedoraproject.org buildvm-ppc64-11.ppc.fedoraproject.org buildvm-ppc64-12.ppc.fedoraproject.org buildvm-ppc64-13.ppc.fedoraproject.org +buildvm-ppc64-14.ppc.fedoraproject.org # # These are primary koji builders. @@ -220,6 +221,7 @@ buildvm-ppc64le-10.ppc.fedoraproject.org buildvm-ppc64le-11.ppc.fedoraproject.org buildvm-ppc64le-12.ppc.fedoraproject.org buildvm-ppc64le-13.ppc.fedoraproject.org +buildvm-ppc64le-14.ppc.fedoraproject.org [bkernel] bkernel01.phx2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64-14.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-14.ppc.fedoraproject.org new file mode 100644 index 0000000000..fb7679f2ef --- /dev/null +++ b/inventory/host_vars/buildvm-ppc64-14.ppc.fedoraproject.org @@ -0,0 +1,4 @@ +--- +vmhost: ppc8-03.ppc.fedoraproject.org +eth0_ip: 10.5.129.50 +eth1_ip: 10.5.127.120 diff --git a/inventory/host_vars/buildvm-ppc64le-14.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-14.ppc.fedoraproject.org new file mode 100644 index 0000000000..5431c3c11b --- /dev/null +++ b/inventory/host_vars/buildvm-ppc64le-14.ppc.fedoraproject.org @@ -0,0 +1,4 @@ +--- +vmhost: ppc8-03.ppc.fedoraproject.org +eth0_ip: 10.5.129.57 +eth1_ip: 10.5.127.138 From a57f1b6ac5eb146d6311ac78251e704b19039539 Mon Sep 17 00:00:00 2001 From: clime Date: Tue, 16 Jan 2018 02:30:46 +0100 Subject: [PATCH 11/15] copr-backend-stg: update ips --- inventory/group_vars/copr-keygen-stg | 8 ++++---- inventory/group_vars/copr-stg | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inventory/group_vars/copr-keygen-stg b/inventory/group_vars/copr-keygen-stg index bd7e74fd5a..cde6565526 100644 --- a/inventory/group_vars/copr-keygen-stg +++ b/inventory/group_vars/copr-keygen-stg @@ -3,10 +3,10 @@ copr_hostbase: copr-keygen-dev tcp_ports: [] # http + signd dest ports -custom_rules: [ '-A INPUT -p tcp -m tcp -s 172.25.32.211 --dport 80 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 172.25.153.203 --dport 80 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 172.25.32.211 --dport 5167 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 172.25.153.203 --dport 5167 -j ACCEPT'] +custom_rules: [ '-A INPUT -p tcp -m tcp -s 172.25.32.217 --dport 80 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 172.25.155.215 --dport 80 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 172.25.32.217 --dport 5167 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 172.25.155.215 --dport 5167 -j ACCEPT'] datacenter: cloud diff --git a/inventory/group_vars/copr-stg b/inventory/group_vars/copr-stg index f807347699..ba54a93df9 100644 --- a/inventory/group_vars/copr-stg +++ b/inventory/group_vars/copr-stg @@ -5,7 +5,7 @@ _forward_src: "forward_dev" # don't forget to update ip in ./copr-keygen-stg, due to custom firewall rules -copr_backend_ips: ["172.25.32.211", "172.25.153.203"] +copr_backend_ips: ["172.25.32.217", "172.25.155.215"] keygen_host: "172.25.32.205" resolvconf: "resolv.conf/cloud" From e638d191b6ec03db4b77c0c2c2bba9cfe09f60f2 Mon Sep 17 00:00:00 2001 From: clime Date: Tue, 16 Jan 2018 10:10:12 +0100 Subject: [PATCH 12/15] copr-be: upgrade to f27 --- inventory/host_vars/copr-be.cloud.fedoraproject.org | 2 +- roles/copr/backend/tasks/main.yml | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/inventory/host_vars/copr-be.cloud.fedoraproject.org b/inventory/host_vars/copr-be.cloud.fedoraproject.org index d4520af1c3..c867097141 100644 --- a/inventory/host_vars/copr-be.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-be.cloud.fedoraproject.org @@ -1,7 +1,7 @@ --- instance_type: ms1.xlarge -image: "{{ fedora25_x86_64 }}" +image: "{{ fedora27_x86_64 }}" keypair: fedora-admin-20130801 security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywhere-persistent,default,allow-nagios-persistent zone: nova diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index 38f893b14d..aed35abc08 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -15,10 +15,6 @@ - copr-backend - copr-selinux -- name: install the latest copr-backend from f26 - command: dnf install -y https://kojipkgs.fedoraproject.org//packages/copr-backend/1.110/1.fc26/noarch/copr-backend-1.110-1.fc26.noarch.rpm - when: env != "staging" - - name: add additional packages for copr-backend dnf: state=present name={{ item }} with_items: @@ -30,7 +26,6 @@ - name: install python2-novaclient version that actually works with the current OpenStack deployment command: dnf install -y https://kojipkgs.fedoraproject.org/packages/python-novaclient/3.3.1/3.fc25/noarch/python2-novaclient-3.3.1-3.fc25.noarch.rpm - when: env == "staging" - name: make copr dirs file: state=directory path={{ item }} From 3461014f3ccff074a45bcb800ba316d2a670bccb Mon Sep 17 00:00:00 2001 From: clime Date: Tue, 16 Jan 2018 10:42:52 +0100 Subject: [PATCH 13/15] copr: update copr_backend_ips --- inventory/group_vars/copr | 2 +- inventory/group_vars/copr-keygen | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inventory/group_vars/copr b/inventory/group_vars/copr index cd85b208ac..fe6ac5edcf 100644 --- a/inventory/group_vars/copr +++ b/inventory/group_vars/copr @@ -4,7 +4,7 @@ _forward_src: "forward" # don't forget to update ip in ./copr-keygen, due to custom firewall rules -copr_backend_ips: ["172.25.32.155", "209.132.184.48"] +copr_backend_ips: ["172.25.32.218", "209.132.184.48"] keygen_host: "172.25.32.209" resolvconf: "resolv.conf/cloud" diff --git a/inventory/group_vars/copr-keygen b/inventory/group_vars/copr-keygen index 0944c156a9..7bb099c0a4 100644 --- a/inventory/group_vars/copr-keygen +++ b/inventory/group_vars/copr-keygen @@ -2,9 +2,9 @@ tcp_ports: [22] # http + signd dest ports -custom_rules: [ '-A INPUT -p tcp -m tcp -s 172.25.32.155 --dport 80 -j ACCEPT', +custom_rules: [ '-A INPUT -p tcp -m tcp -s 172.25.32.218 --dport 80 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 209.132.184.48 --dport 80 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 172.25.32.155 --dport 5167 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 172.25.32.218 --dport 5167 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 209.132.184.48 --dport 5167 -j ACCEPT'] datacenter: cloud From 5a474cba2e7acb18c9383299f092b22e269b89e5 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 16 Jan 2018 10:47:07 +0100 Subject: [PATCH 14/15] Let bodhi staging send messages Signed-off-by: Patrick Uiterwijk --- ...bodhi-backend01.stg.phx2.fedoraproject.org | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org index 769a3cb635..a0a70d6434 100644 --- a/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org @@ -9,3 +9,52 @@ virt_install_command: "{{ virt_install_command_two_nic }}" eth0_ip: 10.5.128.79 eth1_ip: 10.5.127.65 vmhost: virthost12.phx2.fedoraproject.org + +# These are consumed by a task in roles/fedmsg/base/main.yml +fedmsg_certs: +# This first cert is used by the push-tool. releng members run it and it fires +# off a simple fedmsg message that the masher (running as fedmsg-hub) is +# listening for. It then does all the worker. +- service: shell + owner: root + group: masher + can_send: + - bodhi.masher.start +# These are certs for pungi +- service: releng + owner: apache + 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 + - releng.atomic.twoweek.begin + - releng.atomic.twoweek.complete +# These are certs for the masher to publish its own messages as it progresses. +- service: bodhi + owner: root + group: masher + can_send: + - bodhi.mashtask.complete + - bodhi.mashtask.mashing + - bodhi.mashtask.start + - bodhi.mashtask.sync.done + - bodhi.mashtask.sync.wait + - bodhi.ostree.compose.start + - bodhi.ostree.compose.fail + - bodhi.ostree.compose.finish + - bodhi.errata.publish + - bodhi.update.eject + - bodhi.update.complete.testing + - bodhi.update.complete.stable + - bodhi.update.request.stable + - bodhi.update.karma.threshold.reach + - bodhi.buildroot_override.untag +- service: ftpsync + owner: root + group: ftpsync + can_send: + - bodhi.updates.epel.sync + - bodhi.updates.fedora.sync From d1e2eb6fcb1da230dd5660469ba3c7b6d53278b0 Mon Sep 17 00:00:00 2001 From: clime Date: Tue, 16 Jan 2018 11:09:43 +0100 Subject: [PATCH 15/15] copr-be: disable copr-prune-repo until prunerepo is tested properly on f27 --- roles/copr/backend/files/cron.daily/copr-backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/copr/backend/files/cron.daily/copr-backend b/roles/copr/backend/files/cron.daily/copr-backend index 9f89f420c6..700cc5e9d7 100644 --- a/roles/copr/backend/files/cron.daily/copr-backend +++ b/roles/copr/backend/files/cron.daily/copr-backend @@ -1,3 +1,3 @@ #!/usr/bin/sh -runuser -c "PYTHONUNBUFFERED=1 python /usr/bin/copr_prune_results.py &> /dev/null" - copr +#runuser -c "PYTHONUNBUFFERED=1 python /usr/bin/copr_prune_results.py &> /dev/null" - copr