Eucalyptus

Merge lp:~mathiaz/eucalyptus/k-eucalyptus-conf-support into lp:~ubuntu-core-dev/eucalyptus/ubuntu-karmic

  1. k-eucalyptus-conf-support
  2. Merge into ubuntu-karmic
Proposed by Mathias Gug
Status: Merged
Merge reported by: Mathias Gug
Merged at revision: not available
Proposed branch: lp:~mathiaz/eucalyptus/k-eucalyptus-conf-support
Merge into: lp:~ubuntu-core-dev/eucalyptus/ubuntu-karmic
Diff against target: 108 lines
5 files modified
debian/avahi-daemon.conf (+29/-0)
debian/changelog (+7/-0)
debian/eucalyptus-cc.eucalyptus-cc-publication-ip.upstart (+11/-0)
debian/eucalyptus-cc.eucalyptus-cc-publication.upstart (+2/-2)
debian/rules (+5/-0)
To merge this branch: bzr merge lp:~mathiaz/eucalyptus/k-eucalyptus-conf-support
Reviewer Review Type Date Requested Status
Dustin Kirkland  Approve
Review via email: mp+14332@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dustin Kirkland  (kirkland) wrote :

I'm looking forward to seeing this on in action!

review: Approve
Revision history for this message
Dustin Kirkland  (kirkland) wrote :

Meaning... I like it, needs some heavy duty testing though. I'll help with that tomorrow.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'debian/avahi-daemon.conf'
--- debian/avahi-daemon.conf 1970-01-01 00:00:00 +0000
+++ debian/avahi-daemon.conf 2009-11-02 23:25:18 +0000
@@ -0,0 +1,29 @@
1#
2# Eucalyptus avahi-daemon configuration file
3#
4# See avahi-daemon.conf(5) for more information on this configuration
5# file!
6#
7
8[server]
9use-ipv4=yes
10use-ipv6=no
11
12[wide-area]
13enable-wide-area=yes
14
15[publish]
16# Don't publish addresses by default. A specific eucalytpus upstart job
17# takes care of publishing the CC IP/hostname mapping.
18# Public IP of running instances are added to the CC which would be
19# automatically published by avahi-daemon breaking NC installs.
20# LP: #458904
21publish-addresses=no
22
23[rlimits]
24rlimit-core=0
25rlimit-data=4194304
26rlimit-fsize=0
27rlimit-nofile=300
28rlimit-stack=4194304
29rlimit-nproc=3
030
=== modified file 'debian/changelog'
--- debian/changelog 2009-11-02 23:10:25 +0000
+++ debian/changelog 2009-11-02 23:25:19 +0000
@@ -11,6 +11,13 @@
11 * debian/eucalyptus-common.eucalyptus.upstart: Add -l to eucalyptus-cloud11 * debian/eucalyptus-common.eucalyptus.upstart: Add -l to eucalyptus-cloud
12 options so that cloud-output.log is affected by LOGLEVEL (LP: #458001)12 options so that cloud-output.log is affected by LOGLEVEL (LP: #458001)
1313
14 [ Mathias Gug ]
15 * debian/eucalyptus-cc.eucalyptus-cc-publication{,-ip}.upstart: add an
16 upstart job to explicitly publish the IP/CC hostname mapping via avahi
17 instead of publishing the CC IP address via the service name (LP: #458904).
18 * debian/avahi-daemon.conf: ship a specific avahi-daemon configuration file
19 that doesn't publish IP addresses by default. (LP: #458904).
20
14 -- Thierry Carrez <thierry.carrez@ubuntu.com> Tue, 20 Oct 2009 12:26:19 +020021 -- Thierry Carrez <thierry.carrez@ubuntu.com> Tue, 20 Oct 2009 12:26:19 +0200
1522
16eucalyptus (1.6~bzr931-0ubuntu7) karmic; urgency=low23eucalyptus (1.6~bzr931-0ubuntu7) karmic; urgency=low
1724
=== added file 'debian/eucalyptus-cc.eucalyptus-cc-publication-ip.upstart'
--- debian/eucalyptus-cc.eucalyptus-cc-publication-ip.upstart 1970-01-01 00:00:00 +0000
+++ debian/eucalyptus-cc.eucalyptus-cc-publication-ip.upstart 2009-11-02 23:25:19 +0000
@@ -0,0 +1,11 @@
1description "Eucalyptus cluster controller IP publication"
2author "Mathias Gug <mathias.gug@canonical.com>"
3
4start on started eucalyptus-cc
5stop on stopping eucalyptus-cc
6
7script
8 . /etc/eucalyptus/eucalyptus.conf
9 . /etc/eucalyptus/eucalyptus-ipaddr.conf
10 exec avahi-publish -a $(hostname).local $CC_IP_ADDR
11end script
012
=== modified file 'debian/eucalyptus-cc.eucalyptus-cc-publication.upstart'
--- debian/eucalyptus-cc.eucalyptus-cc-publication.upstart 2009-10-07 19:34:34 +0000
+++ debian/eucalyptus-cc.eucalyptus-cc-publication.upstart 2009-11-02 23:25:19 +0000
@@ -1,11 +1,11 @@
1description "Eucalyptus cluster controller publication"1description "Eucalyptus cluster controller publication"
2author "Matt Zimmerman <mdz@canonical.com>"2author "Matt Zimmerman <mdz@canonical.com>"
33
4start on started eucalyptus-cc4start on started eucalyptus-cc-publication-ip
5stop on stopping eucalyptus-cc5stop on stopping eucalyptus-cc
66
7script7script
8 . /etc/eucalyptus/eucalyptus.conf8 . /etc/eucalyptus/eucalyptus.conf
9 . /etc/eucalyptus/eucalyptus-ipaddr.conf9 . /etc/eucalyptus/eucalyptus-ipaddr.conf
10 exec avahi-publish -s $CC_IP_ADDR _eucalyptus._tcp $CC_PORT txtvers=1 protovers=1.5.0 type=cluster10 exec avahi-publish -s "Eucalyptus cluster controller" _eucalyptus._tcp $CC_PORT txtvers=1 protovers=1.5.0 type=cluster
11end script11end script
1212
=== modified file 'debian/rules'
--- debian/rules 2009-10-14 00:43:55 +0000
+++ debian/rules 2009-11-02 23:25:19 +0000
@@ -37,6 +37,10 @@
37 install -D debian/eucalyptus-udeb.finish-install \37 install -D debian/eucalyptus-udeb.finish-install \
38 $(DEB_DESTDIR)/usr/lib/finish-install.d/60eucalyptus-udeb38 $(DEB_DESTDIR)/usr/lib/finish-install.d/60eucalyptus-udeb
3939
40install/eucalyptus-cc::
41 install -D debian/avahi-daemon.conf \
42 $(DEB_DESTDIR)/etc/eucalyptus/avahi-daemon.conf
43
40DEB_DH_INSTALLINIT_ARGS=--noscripts44DEB_DH_INSTALLINIT_ARGS=--noscripts
4145
42binary-install/eucalyptus-nc::46binary-install/eucalyptus-nc::
@@ -47,6 +51,7 @@
4751
48binary-install/eucalyptus-cc::52binary-install/eucalyptus-cc::
49 dh_installinit -p$(cdbs_curpkg) --noscripts --name=eucalyptus-cc-publication --noscripts53 dh_installinit -p$(cdbs_curpkg) --noscripts --name=eucalyptus-cc-publication --noscripts
54 dh_installinit -p$(cdbs_curpkg) --noscripts --name=eucalyptus-cc-publication-ip --noscripts
5055
51binary-install/eucalyptus-cloud::56binary-install/eucalyptus-cloud::
52 dh_installinit -p$(cdbs_curpkg) --noscripts --name=eucalyptus-cc-registration --noscripts57 dh_installinit -p$(cdbs_curpkg) --noscripts --name=eucalyptus-cc-registration --noscripts

Subscribers

People subscribed via source and target branches

to all changes: