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/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 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 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" 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 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 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-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-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-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 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 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 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 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/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 diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index 90f90f9fad..aed35abc08 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -15,9 +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 - - name: add additional packages for copr-backend dnf: state=present name={{ item }} with_items: @@ -27,6 +24,9 @@ - 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 + - name: make copr dirs file: state=directory path={{ item }} with_items: 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