Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /srv/web/infra/ansible

Browse source
This commit is contained in:
Tim Flink 2013-07-19 20:45:06 +00:00
commit 7ecefe49d3
5 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
files/iptables/kojibuilder
View file

@ -58,10 +58,10 @@
-A OUTPUT -m tcp -p tcp --dport 9418 -d 66.135.62.191 -j ACCEPT
-A OUTPUT -m udp -p udp --dport 9418 -d 66.135.62.191 -j ACCEPT
#nfs to nfs01.phx2.fedoraproject.org - a little to wide-open - but
#nfs to vtap-fedora-nfs01.storage.phx2.redhat.com - a little to wide-open - but
# kinda necessary
-A INPUT -m tcp -p tcp -s 10.5.127.11 -j ACCEPT
-A OUTPUT -m tcp -p tcp -d 10.5.127.11 -j ACCEPT
-A INPUT -m tcp -p tcp -s 10.5.88.36 -j ACCEPT
-A OUTPUT -m tcp -p tcp -d 10.5.88.36 -j ACCEPT
# ntp
-A OUTPUT -m udp -p udp --dport 123 -d 66.187.233.4 -j ACCEPT

8
files/iptables/releng
View file

@ -43,12 +43,8 @@ COMMIT
-A INPUT -p tcp -m tcp --dport 22 -j ACCEPT
# Allow all netapp traffic
-A INPUT -p udp -m udp -s 10.5.88.11 -j ACCEPT
-A INPUT -p tcp -m tcp -s 10.5.88.11 -j ACCEPT
-A INPUT -p udp -m udp -s 10.5.88.20 -j ACCEPT
-A INPUT -p tcp -m tcp -s 10.5.88.20 -j ACCEPT
-A INPUT -p udp -m udp -s 10.5.88.21 -j ACCEPT
-A INPUT -p tcp -m tcp -s 10.5.88.21 -j ACCEPT
-A INPUT -p udp -m udp -s 10.5.88.36 -j ACCEPT
-A INPUT -p tcp -m tcp -s 10.5.88.36 -j ACCEPT
# Bacula Backups backup03
-A INPUT -p tcp -m tcp -s 10.5.126.161 --dport 9102 -j ACCEPT

4
files/releng/rawhide
View file

@ -1,3 +1,3 @@
# rawhide compose
#MAILTO=rel-eng@lists.fedoraproject.org
#15 8 * * * masher TMPDIR=`mktemp -d /tmp/rawhide.XXXXXX` && cd $TMPDIR && git clone -n git://git.fedorahosted.org/releng && cd releng && git checkout -b stable rawhide-stable && LANG=en_US.UTF-8 ./scripts/buildrawhide $(date "+\%Y\%m\%d") && sudo -u ftpsync /usr/local/bin/update-fullfilelist fedora
MAILTO=rel-eng@lists.fedoraproject.org
15 8 * * * masher TMPDIR=`mktemp -d /tmp/rawhide.XXXXXX` && cd $TMPDIR && git clone -n git://git.fedorahosted.org/releng && cd releng && git checkout -b stable rawhide-stable && LANG=en_US.UTF-8 ./scripts/buildrawhide $(date "+\%Y\%m\%d") && sudo -u ftpsync /usr/local/bin/update-fullfilelist fedora

6
tasks/koji/base_builder.yml
View file

@ -138,6 +138,12 @@
- nfs
- nfslock
- name: route config for netapp network
action: copy src=$files/kojibuilder/route-eth1 dest=/etc/sysconfig/network-scripts/route-eth1
- name: add netapp network route
action: command /etc/sysconfig/network-scripts/ifup-routes eth1
- name: nfs mount points
action: mount name=/mnt/fedora_koji src=vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/fedora_koji fstype=nfs opts=ro,hard,bg,intr,noatime,nodev,nosuid passno=0 dump=0 state=mounted
only_if: "'${inventory_hostname}'.startswith('build')"

10
tasks/koji/releng_config.yml
View file

@ -88,7 +88,6 @@
action: file state=directory path=$item
with_items:
- /pub
- /mnt/koji
- /pub/fedora
- /pub/epel
- /epel
@ -147,14 +146,17 @@
- nfslock
#- name: route to netapp network
# action: copy src=$files/kojibuilder/route-eth1 dest=/etc/sysconfig/network-scripts/route-eth1
- name: route to netapp network
action: copy src=$files/kojibuilder/route-eth1 dest=/etc/sysconfig/network-scripts/route-eth1
- name: add netapp network route
action: command /etc/sysconfig/network-scripts/ifup-routes eth1
- name: nfsmount - /pub/fedora
action: mount name=/pub/fedora src=vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/fedora_ftp/fedora.redhat.com/pub/fedora fstype=nfs opts=rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3 passno=0 dump=0 state=mounted
- name: nfs mount points
action: mount name=/mnt/fedora_koji src=vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/fedora_koji fstype=nfs3 opts=ro,hard,bg,intr,noatime,nodev,nosuid passno=0 dump=0 state=mounted
action: mount name=/mnt/fedora_koji src=vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/fedora_koji fstype=nfs opts=ro,hard,bg,intr,noatime,nodev,nosuid passno=0 dump=0 state=mounted
- name: make a mnt/koji link
action: file state=link src=/mnt/fedora_koji/koji dest=/mnt/koji