Ottomata has submitted this change and it was merged.
Change subject: Removing now unused manual socat relay confs.
......................................................................
Removing now unused manual socat relay confs.
This is now handled by the misc::logging::relay define.
Change-Id: Ib1a421a3778bd431c6254c34b0c37b1785512477
---
D files/upstart/event-logging-vanadium-relay.conf
D files/upstart/squid-logging-multicast-relay.conf
M manifests/misc/logging.pp
M manifests/site.pp
4 files changed, 0 insertions(+), 67 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/files/upstart/event-logging-vanadium-relay.conf
b/files/upstart/event-logging-vanadium-relay.conf
deleted file mode 100644
index 720b8f8..0000000
--- a/files/upstart/event-logging-vanadium-relay.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is managed by Puppet!
-#
-# squid-logging-multicast-relay
-
-description "esams bits event logging to vanadium relay"
-
-start on filesystem
-stop on runlevel S
-
-respawn
-respawn limit 10 5
-umask 022
-
-exec /usr/bin/socat UDP-RECV:8422,su=nobody UDP4-DATAGRAM:10.64.21.123:8422
diff --git a/files/upstart/squid-logging-multicast-relay.conf
b/files/upstart/squid-logging-multicast-relay.conf
deleted file mode 100644
index 76c453d..0000000
--- a/files/upstart/squid-logging-multicast-relay.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is managed by Puppet!
-# NOTE: This file has been deprecated in favor of the
-# renamed 'logging-relay.upstart.conf.erb file.'.
-# It will be removed once oxygen no longer uses it.
-# squid-logging-multicast-relay
-
-description "Squid logging unicast to multicast relay"
-
-start on filesystem
-stop on runlevel S
-
-respawn
-respawn limit 10 5
-umask 022
-
-exec /usr/bin/socat UDP-RECV:8419,su=nobody
UDP4-DATAGRAM:233.58.59.1:8420,ip-multicast-ttl=10
diff --git a/manifests/misc/logging.pp b/manifests/misc/logging.pp
index 4d548c8..a219d86 100644
--- a/manifests/misc/logging.pp
+++ b/manifests/misc/logging.pp
@@ -89,37 +89,3 @@
provider => 'upstart',
}
}
-
-
-# NOTE: This class is depcreated.
-# It will be removed once oxygen is no longer using it.
-class misc::squid-logging::multicast-relay {
- require misc::logging::socat
-
- system_role { "misc::squid-logging::multicast-relay": description =>
"Squid logging unicast to multicast relay" }
-
- upstart_job { "squid-logging-multicast-relay": install => "true" }
-
- service { squid-logging-multicast-relay:
- require => [ Package[socat],
Upstart_job[squid-logging-multicast-relay] ],
- subscribe => Upstart_job[squid-logging-multicast-relay],
- ensure => running;
- }
-}
-
-
-# NOTE: This class is deprecated.
-# It will be removed once oxygen is no longer using it.
-class misc::logging::vanadium-relay {
- require misc::logging::socat
-
- system_role { "misc::logging::vanadium-relay": description => "esams
bits event logging to vanadium relay" }
-
- upstart_job { "event-logging-vanadium-relay": install => "true" }
-
- service { event-logging-vanadium-relay:
- require => [ Package[socat],
Upstart_job[event-logging-vanadium-relay] ],
- subscribe => Upstart_job[event-logging-vanadium-relay],
- ensure => running;
- }
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index 1cddc40..78bc079 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1287,7 +1287,6 @@
ganglia,
exim::simple-mail-sender,
misc::url-downloader
- # misc::squid-logging::multicast-relay # linne has no iptable
rules, and this appears unused here
class { 'ntp::server':
servers => [ "198.186.191.229", "64.113.32.2", "173.8.198.242",
"208.75.88.4", "75.144.70.35" ],
@@ -2093,8 +2092,6 @@
accounts::milimetric
include
- misc::squid-logging::multicast-relay,
- misc::logging::vanadium-relay,
misc::udp2log
sudo_user { "otto": privileges => ['ALL = NOPASSWD: ALL'] }
--
To view, visit https://gerrit.wikimedia.org/r/62022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1a421a3778bd431c6254c34b0c37b1785512477
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
