FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Redhat > Fedora Infrastructure

 
 
LinkBack Thread Tools
 
Old 10-26-2010, 04:14 PM
 
Default mount netapp at /pub/ and not below

From: Matt Domsch <mdomsch@puppet01.phx2.fedoraproject.org>

---
manifests/nodes/releng01.phx2.fedoraproject.org.pp | 8 ++--
manifests/servergroups/compose.pp | 2 +-
modules/mirrormanager/manifests/init.pp | 33 ++------------------
3 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/manifests/nodes/releng01.phx2.fedoraproject.org.pp b/manifests/nodes/releng01.phx2.fedoraproject.org.pp
index f7f06c1..4970834 100644
--- a/manifests/nodes/releng01.phx2.fedoraproject.org.pp
+++ b/manifests/nodes/releng01.phx2.fedoraproject.org.pp
@@ -17,17 +17,17 @@ node releng01{

collectd::collectd { 'log01': }

- file { ['/pub', '/pub/fedora']:
+ file { ['/pub']:
ensure => directory
}

- mount { "/pub/fedora":
- device => "n4aphx2-3.storage.phx2.redhat.com:/vol/ftp_fedora/fedora.redhat.com/pub/fedora",
+ mount { "/pub":
+ device => "n4aphx2-3.storage.phx2.redhat.com:/vol/ftp_fedora/fedora.redhat.com/pub",
fstype => "nfs",
ensure => "mounted",
options => "rw,hard,bg,intr,nolock,noatime,nodev,nosuid,nfsve rs=3",
atboot => true,
- require => File['/pub/fedora']
+ require => File['/pub']
}
mount { "/mnt/koji":
device => "nfs01.phx2.fedoraproject.org:/",
diff --git a/manifests/servergroups/compose.pp b/manifests/servergroups/compose.pp
index 0db1242..b141785 100644
--- a/manifests/servergroups/compose.pp
+++ b/manifests/servergroups/compose.pp
@@ -22,7 +22,7 @@ class composer {
tcpPorts => [ 80, 8887, 8888, 8889 ]
}

- file { [ '/pub', '/pub/fedora' ]:
+ file { [ '/pub' ]:
ensure => directory,
}

diff --git a/modules/mirrormanager/manifests/init.pp b/modules/mirrormanager/manifests/init.pp
index 12832e3..bf27eb4 100644
--- a/modules/mirrormanager/manifests/init.pp
+++ b/modules/mirrormanager/manifests/init.pp
@@ -174,29 +174,17 @@ class mirrormanager::app::nobalance inherits mirrormanager::app {
class mirrormanager::mounts {
file { [
"/pub",
- "/pub/epel",
- "/pub/fedora",
"/pub/fedora-secondary",
- "/pub/alt",
- "/pub/archive",
]:
ensure => directory,
}

- mount { "/pub/fedora":
- device => "n4aphx2-3.storage.phx2.redhat.com:/vol/ftp_fedora/fedora.redhat.com/pub/fedora",
+ mount { "/pub":
+ device => "n4aphx2-3.storage.phx2.redhat.com:/vol/ftp_fedora/fedora.redhat.com/pub",
fstype => "nfs",
ensure => "mounted",
options => "defaults,ro,soft,intr",
- require => File["/pub/fedora"],
- }
-
- mount { "/pub/epel":
- device => "n4aphx2-3.storage.phx2.redhat.com:/vol/ftp_fedora/fedora.redhat.com/pub/epel",
- fstype => "nfs",
- ensure => "mounted",
- options => "defaults,ro,soft,intr",
- require => File["/pub/epel"],
+ require => File["/pub"],
}

mount { "/pub/fedora-secondary":
@@ -207,21 +195,6 @@ class mirrormanager::mounts {
require => File["/pub/fedora-secondary"],
}

- mount { "/pub/archive":
- device => "n4aphx2-3.storage.phx2.redhat.com:/vol/ftp_fedora/fedora.redhat.com/pub/archive",
- fstype => "nfs",
- ensure => "mounted",
- options => "defaults,ro,soft,intr",
- require => File["/pub/archive"],
- }
-
- mount { "/pub/alt":
- device => "n4aphx2-3.storage.phx2.redhat.com:/vol/ftp_fedora/fedora.redhat.com/pub/alt",
- fstype => "nfs",
- ensure => "mounted",
- options => "defaults,ro,soft,intr",
- require => File["/pub/alt"],
- }
}

define mirrormanager:roxy(
--
1.5.5.6

_______________________________________________
infrastructure mailing list
infrastructure@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/infrastructure
 

Thread Tools




All times are GMT. The time now is 12:28 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org