I need 2 +1's to push this change
-sv
On Fri, 4 Jan 2013, skvidal@xxxxxxxxxxxxxxxxx wrote:
From: Seth Vidal <skvidal@xxxxxxxxxxxxxxxxx>
---
manifests/nodes/app07.phx2.fedoraproject.org.pp | 18 ------------------
manifests/nodes/proxy01.phx2.fedoraproject.org.pp | 3 +--
manifests/services/phx.pp | 1 -
modules/mirrormanager/files/mm_sync_out | 2 +-
modules/scripts/files/syncHttpLogs.sh | 1 -
5 files changed, 2 insertions(+), 23 deletions(-)
delete mode 100644 manifests/nodes/app07.phx2.fedoraproject.org.pp
diff --git a/manifests/nodes/app07.phx2.fedoraproject.org.pp b/manifests/nodes/app07.phx2.fedoraproject.org.pp
deleted file mode 100644
index 1f2a963..0000000
--- a/manifests/nodes/app07.phx2.fedoraproject.org.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-node app07 {
- $fas_groups= [ "sysadmin-main", "sysadmin-web", "sysadmin-noc" ]
- include phx
- include openvpn::client
- include global
- include fas::client
- include http_log
- include selinux
- include fedoracommunity::app
-
- collectd::collectd { 'log02': }
- collectd::apache { 'localhost': }
-
- route { 'eth1':
- content => '10.5.88.0/24 dev eth1'
- }
-
-}
diff --git a/manifests/nodes/proxy01.phx2.fedoraproject.org.pp b/manifests/nodes/proxy01.phx2.fedoraproject.org.pp
index 8ca999a..fa4a7e5 100644
--- a/manifests/nodes/proxy01.phx2.fedoraproject.org.pp
+++ b/manifests/nodes/proxy01.phx2.fedoraproject.org.pp
@@ -26,8 +26,7 @@ node proxy01 {
}
host { "app07.phx2.fedoraproject.org":
- ip => "10.5.126.37",
- host_aliases => ["app7", "app07"],
+ ensure => absent,
}
host { "bapp02.phx2.fedoraproject.org":
diff --git a/manifests/services/phx.pp b/manifests/services/phx.pp
index 316e5d8..cc71163 100644
--- a/manifests/services/phx.pp
+++ b/manifests/services/phx.pp
@@ -91,7 +91,6 @@ class phx {
"app02",
"app04",
"app06",
- "app07",
]
}
diff --git a/modules/mirrormanager/files/mm_sync_out b/modules/mirrormanager/files/mm_sync_out
index f3ec394..446c45f 100755
--- a/modules/mirrormanager/files/mm_sync_out
+++ b/modules/mirrormanager/files/mm_sync_out
@@ -1,4 +1,4 @@
#!/bin/bash
-for s in app01 app02 app03 app04 app05 app06 app07 app08; do
+for s in app01 app02 app03 app04 app05 app06 app08; do
ssh $s /usr/share/mirrormanager/mm_sync_data
done
diff --git a/modules/scripts/files/syncHttpLogs.sh b/modules/scripts/files/syncHttpLogs.sh
index bcddd81..af46191 100644
--- a/modules/scripts/files/syncHttpLogs.sh
+++ b/modules/scripts/files/syncHttpLogs.sh
@@ -41,7 +41,6 @@ syncHttpLogs app03.phx2.fedoraproject.org
syncHttpLogs app04.phx2.fedoraproject.org
syncHttpLogs app05.vpn.fedoraproject.org
syncHttpLogs app06.vpn.fedoraproject.org
-syncHttpLogs app07.phx2.fedoraproject.org
syncHttpLogs app08.vpn.fedoraproject.org
syncHttpLogs bapp02.phx2.fedoraproject.org
syncHttpLogs fas01.phx2.fedoraproject.org
--
1.7.2.1
_______________________________________________
infrastructure mailing list
infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/infrastructure
