Merge branch 'master' of /git/ansible

This commit is contained in:
Jan Kaluža 2018-01-16 10:23:48 +00:00
commit db6bf44bfc
34 changed files with 102 additions and 49 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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"

View file

@ -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

View file

@ -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

View file

@ -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"

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -0,0 +1,4 @@
---
vmhost: ppc8-03.ppc.fedoraproject.org
eth0_ip: 10.5.129.50
eth1_ip: 10.5.127.120

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -0,0 +1,4 @@
---
vmhost: ppc8-03.ppc.fedoraproject.org
eth0_ip: 10.5.129.57
eth1_ip: 10.5.127.138

View file

@ -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

View file

@ -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

View file

@ -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:

View file

@ -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