Here's a better freeze break request that has actual changes. ;)

Basically I need to get the new storage mounted on nfs01 and backup03.

On nfs01:

- add route to netapp network - add directories to mount on - mount new space

On backup03:

- Add eth1 interface with route to netapp network. - add directory to mount on - mount new space

On netapp:

- change exports slightly to allow nfs01 access to koji space, and allow backup03's new storage network ip access to the backup space. (We had it with the normal net in there, but it cannot reach the netapp).

+1s?

kevin -- diff --git a/manifests/nodes/backup03.phx2.fedoraproject.org.pp b/manifests/nodes/backup03.phx2.fedo index 4e1d9ee..2c96d8c 100644 --- a/manifests/nodes/backup03.phx2.fedoraproject.org.pp +++ b/manifests/nodes/backup03.phx2.fedoraproject.org.pp @@ -19,5 +19,27 @@ node backup03 { iptables::firewall { 'ipv4': tcpPorts => [ 9101, 9102, 9103 ] } -}

+ eth { 'eth1': + ipaddr => '10.5.127.28', + netmask => '255.255.255.0', + } + + route { 'eth1': + content => '10.5.88.0/24 dev eth1' + } + + file { ['/fedora_backups']: + ensure => directory + } + + mount { "/fedora_backups": + device => "vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/fedora_backups", + fstype => "nfs", + ensure => "mounted", + options => "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3", + atboot => true, + require => File['/fedora_backups'] + } + +} diff --git a/manifests/nodes/nfs01.phx2.fedoraproject.org.pp b/manifests/nodes/nfs01.phx2.fedoraproj index d31ede2..6e1ee4f 100644 --- a/manifests/nodes/nfs01.phx2.fedoraproject.org.pp +++ b/manifests/nodes/nfs01.phx2.fedoraproject.org.pp @@ -8,6 +8,23 @@ node nfs01{ include iscsi-initiator-utils::initiator include rsync::server

+ route { 'eth0': + content => '10.5.88.0/24 dev eth1' + } + + file { ['/mnt', '/mnt/fedora_koji']: + ensure => directory + } + + mount { "/mnt/fedora_koji": + device => "vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/fedora_koji", + fstype => "nfs", + ensure => "mounted", + options => "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3", + atboot => true, + require => File['/mnt/fedora_koji'] + } + collectd::collectd { 'log02': }

iptables::firewall { 'ipv4': diff --git a/files/ntap-fedora-nfs01.storage.phx2.redhat.com/exports b/files/ntap-fedora-nfs01.storage.phx2.redhat.com/exports index 4c52a23..13561ac 100644 --- a/files/ntap-fedora-nfs01.storage.phx2.redhat.com/exports +++ b/files/ntap-fedora-nfs01.storage.phx2.redhat.com/exports @@ -36,8 +36,8 @@ /vol/fedora_app_staging/app -sec=sys,rw=10.5.127.29:10.5.127.30,root=10.5.127.29:10.5.127.30 # INC49937 - new fedora volumes # koji -/vol/fedora_koji -sec=sys,rw=10.5.127.59:10.5.127.60:10.5.127.38:10.5.127.39:10.5.127.53:10.5.127.54:10.5.127.55:10.5.127.67:10.5.127.68:10.5.127.70:10.5.127.41:10.5.127.190:10.5.127.69,root=10.5.127.59:10.5.127.60:10.5.127.38:10.5.127.39:10.5.127.53:10.5.127.54:10.5.127.55:10.5.127.67:10.5.127.68:10.5.127.70:10.5.127.41:10.5.127.190:10.5.127.69,ro=10.5.127.0/24 +/vol/fedora_koji -sec=sys,rw=10.5.127.11:rw=10.5.127.59:10.5.127.60:10.5.127.38:10.5.127.39:10.5.127.53:10.5.127.54:10.5.127.55:10.5.127.67:10.5.127.68:10.5.127.70:10.5.127.41:10.5.127.190:10.5.127.69,root=10.5.127.59:10.5.127.60:10.5.127.38:10.5.127.39:10.5.127.53:10.5.127.54:10.5.127.55:10.5.127.67:10.5.127.68:10.5.127.70:10.5.127.41:10.5.127.190:10.5.127.69,ro=10.5.127.0/24 # general fedora backups -/vol/fedora_backups -sec=sys,rw=10.5.126.161,root=10.5.126.161 +/vol/fedora_backups -sec=sys,rw=10.5.127.28,root=10.5.127.28 # lookaside source cache /vol/fedora_sourcecache -sec=sys,rw=10.5.127.67