From 31fae4472c1e45a896706d819df9df8b5c7d6877 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 19 Jul 2013 16:11:44 +0000 Subject: [PATCH 1/6] Hacky fix for netapp route, need better one --- tasks/koji/base_builder.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tasks/koji/base_builder.yml b/tasks/koji/base_builder.yml index 0ca205735f..8e6b780677 100644 --- a/tasks/koji/base_builder.yml +++ b/tasks/koji/base_builder.yml @@ -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')" From d1ac58c0a57cbec91ad5e999fcc349516a22231f Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 19 Jul 2013 16:56:15 +0000 Subject: [PATCH 2/6] This needs to be netapp now, not nfs01 --- files/iptables/kojibuilder | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/iptables/kojibuilder b/files/iptables/kojibuilder index 82e98a8a34..03219ffcc4 100644 --- a/files/iptables/kojibuilder +++ b/files/iptables/kojibuilder @@ -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 From d047b7ad2487df66cca2829e43e76b4d627a7882 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 19 Jul 2013 19:43:53 +0000 Subject: [PATCH 3/6] Re-enable rawhide for tomorrow. --- files/releng/rawhide | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/releng/rawhide b/files/releng/rawhide index f8af7fcdeb..7c57d8ff35 100644 --- a/files/releng/rawhide +++ b/files/releng/rawhide @@ -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 From 236fdc171fc4257d8482a912074bdaebcf1d6ab4 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 19 Jul 2013 19:45:08 +0000 Subject: [PATCH 4/6] nfs not nfs3 --- tasks/koji/releng_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/koji/releng_config.yml b/tasks/koji/releng_config.yml index fa7d4d6fd1..5917726d5e 100644 --- a/tasks/koji/releng_config.yml +++ b/tasks/koji/releng_config.yml @@ -154,7 +154,7 @@ 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 From ef28d2827041ea6feb280c798c214d77c00f2443 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 19 Jul 2013 19:48:18 +0000 Subject: [PATCH 5/6] Fix netapp in releng iptables, clean up directory --- files/iptables/releng | 8 ++------ tasks/koji/releng_config.yml | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/files/iptables/releng b/files/iptables/releng index b89605c02c..7048429360 100644 --- a/files/iptables/releng +++ b/files/iptables/releng @@ -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 diff --git a/tasks/koji/releng_config.yml b/tasks/koji/releng_config.yml index 5917726d5e..44e04c5819 100644 --- a/tasks/koji/releng_config.yml +++ b/tasks/koji/releng_config.yml @@ -88,7 +88,6 @@ action: file state=directory path=$item with_items: - /pub - - /mnt/koji - /pub/fedora - /pub/epel - /epel From ac2c18dd07a8cd4a7376a099eb4ff42921b13ebd Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 19 Jul 2013 19:50:42 +0000 Subject: [PATCH 6/6] Add netapp route to releng group --- tasks/koji/releng_config.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tasks/koji/releng_config.yml b/tasks/koji/releng_config.yml index 44e04c5819..745dd96988 100644 --- a/tasks/koji/releng_config.yml +++ b/tasks/koji/releng_config.yml @@ -146,8 +146,11 @@ - 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