------------------------------------------------------------
revno: 11
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Thu 2014-01-02 12:07:44 +0000
message:
auto update
added:
etc/init/lbcd.conf
modified:
etc/init/ceph-mds-all-starter.conf
etc/init/ceph-mon-all-starter.conf
etc/init/ceph-osd-all-starter.conf
etc/init/lxc-net.conf
--
lp:~upstart-devel/upstart/upstart-jobs
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs
Your team Upstart Reviewers is subscribed to branch
lp:~upstart-devel/upstart/upstart-jobs.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs/+edit-subscription
=== modified file 'etc/init/ceph-mds-all-starter.conf'
--- etc/init/ceph-mds-all-starter.conf 2013-11-18 12:42:03 +0000
+++ etc/init/ceph-mds-all-starter.conf 2014-01-02 12:07:44 +0000
@@ -9,7 +9,7 @@
# TODO what's the valid charset for cluster names and mds ids?
find -L /var/lib/ceph/mds/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[A-Za-z0-9]+-[A-Za-z0-9._-]+' -printf '%P\n' \
| while read f; do
- if [ -e "/var/lib/ceph/mds/$f/done" ] && [ -e "/var/lib/ceph/mds/$f/upstart" ]; then
+ if [ -e "/var/lib/ceph/mds/$f/done" ] && [ -e "/var/lib/ceph/mds/$f/upstart" ] && [ ! -e "/var/lib/ceph/mds/$f/sysvinit" ]; then
cluster="${f%%-*}"
id="${f#*-}"
initctl emit ceph-mds cluster="$cluster" id="$id"
=== modified file 'etc/init/ceph-mon-all-starter.conf'
--- etc/init/ceph-mon-all-starter.conf 2013-11-18 12:42:03 +0000
+++ etc/init/ceph-mon-all-starter.conf 2014-01-02 12:07:44 +0000
@@ -9,7 +9,7 @@
# TODO what's the valid charset for cluster names and mon ids?
find -L /var/lib/ceph/mon/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[A-Za-z0-9]+-[A-Za-z0-9._-]+' -printf '%P\n' \
| while read f; do
- if [ -e "/var/lib/ceph/mon/$f/done" ] && [ -e "/var/lib/ceph/mon/$f/upstart" ]; then
+ if [ -e "/var/lib/ceph/mon/$f/done" ] && [ -e "/var/lib/ceph/mon/$f/upstart" ] && [ ! -e "/var/lib/ceph/mon/$f/sysvinit" ]; then
cluster="${f%%-*}"
id="${f#*-}"
=== modified file 'etc/init/ceph-osd-all-starter.conf'
--- etc/init/ceph-osd-all-starter.conf 2013-11-18 12:42:03 +0000
+++ etc/init/ceph-osd-all-starter.conf 2014-01-02 12:07:44 +0000
@@ -13,7 +13,7 @@
# TODO what's the valid charset for cluster names and osd ids?
find -L /var/lib/ceph/osd/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[A-Za-z0-9]+-[A-Za-z0-9._-]+' -printf '%P\n' \
| while read f; do
- if [ -e "/var/lib/ceph/osd/$f/ready" ] && [ -e "/var/lib/ceph/osd/$f/upstart" ]; then
+ if [ -e "/var/lib/ceph/osd/$f/ready" ] && [ -e "/var/lib/ceph/osd/$f/upstart" ] && [ ! -e "/var/lib/ceph/osd/$f/sysvinit" ]; then
cluster="${f%%-*}"
id="${f#*-}"
initctl emit ceph-osd cluster="$cluster" id="$id"
=== added file 'etc/init/lbcd.conf'
--- etc/init/lbcd.conf 1970-01-01 00:00:00 +0000
+++ etc/init/lbcd.conf 2014-01-02 12:07:44 +0000
@@ -0,0 +1,26 @@
+# upstart configuration for lbcd. -*- upstart -*-
+
+description "Responder for load balancing"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+expect stop
+setuid lbcd
+setgid lbcd
+
+pre-start script
+ test -x /usr/sbin/lbcd || { stop; exit 0; }
+end script
+
+# To change the default lbcd service, specify a command to run for the
+# weight and interval, or do round-robin (-R), add the flags to DAEMON_OPTS
+# in /etc/default/lbcd. This will ensure consistent behavior across all
+# init systems.
+script
+ if [ -f /etc/default/lbcd ] ; then
+ . /etc/default/lbcd
+ fi
+ exec /usr/sbin/lbcd -f -l -Z $DAEMON_OPTS
+end script
=== modified file 'etc/init/lxc-net.conf'
--- etc/init/lxc-net.conf 2013-12-13 18:38:08 +0000
+++ etc/init/lxc-net.conf 2014-01-02 12:07:44 +0000
@@ -24,7 +24,12 @@
iptables -w -L -n 2>&1 > /dev/null || use_iptables_lock=""
cleanup() {
# dnsmasq failed to start, clean up the bridge
+ iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 67 -j ACCEPT
+ iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p tcp --dport 67 -j ACCEPT
+ iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 53 -j ACCEPT
+ iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p tcp --dport 53 -j ACCEPT
iptables $use_iptables_lock -t nat -D POSTROUTING -s ${LXC_NETWORK} ! -d ${LXC_NETWORK} -j MASQUERADE || true
+ iptables $use_iptables_lock -t mangle -D POSTROUTING -o ${LXC_BRIDGE} -p udp -m udp --dport 68 -j CHECKSUM --checksum-fill
ifconfig ${LXC_BRIDGE} down || true
brctl delbr ${LXC_BRIDGE} || true
}
@@ -42,6 +47,10 @@
echo 1 > /proc/sys/net/ipv4/ip_forward
mkdir -p ${varrun}
ifconfig ${LXC_BRIDGE} ${LXC_ADDR} netmask ${LXC_NETMASK} up
+ iptables $use_iptables_lock -I INPUT -i ${LXC_BRIDGE} -p udp --dport 67 -j ACCEPT
+ iptables $use_iptables_lock -I INPUT -i ${LXC_BRIDGE} -p tcp --dport 67 -j ACCEPT
+ iptables $use_iptables_lock -I INPUT -i ${LXC_BRIDGE} -p udp --dport 53 -j ACCEPT
+ iptables $use_iptables_lock -I INPUT -i ${LXC_BRIDGE} -p tcp --dport 53 -j ACCEPT
iptables $use_iptables_lock -t nat -A POSTROUTING -s ${LXC_NETWORK} ! -d ${LXC_NETWORK} -j MASQUERADE
iptables $use_iptables_lock -t mangle -A POSTROUTING -o ${LXC_BRIDGE} -p udp -m udp --dport 68 -j CHECKSUM --checksum-fill
@@ -63,6 +72,10 @@
use_iptables_lock="-w"
iptables -w -L -n 2>&1 > /dev/null || use_iptables_lock=""
ifconfig ${LXC_BRIDGE} down
+ iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 67 -j ACCEPT
+ iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p tcp --dport 67 -j ACCEPT
+ iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 53 -j ACCEPT
+ iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p tcp --dport 53 -j ACCEPT
iptables $use_iptables_lock -t nat -D POSTROUTING -s ${LXC_NETWORK} ! -d ${LXC_NETWORK} -j MASQUERADE || true
iptables $use_iptables_lock -t mangle -D POSTROUTING -o ${LXC_BRIDGE} -p udp -m udp --dport 68 -j CHECKSUM --checksum-fill
pid=`cat ${varrun}/dnsmasq.pid 2>/dev/null` && kill -9 $pid || true
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
