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

Proposed by Mathias Gug on 2009-11-02
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  2009-11-02 Approve on 2009-11-02
Review via email: mp+14332@code.launchpad.net
To post a comment you must log in.
Dustin Kirkland  (kirkland) wrote :

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

review: Approve
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
1=== added file 'debian/avahi-daemon.conf'
2--- debian/avahi-daemon.conf 1970-01-01 00:00:00 +0000
3+++ debian/avahi-daemon.conf 2009-11-02 23:25:18 +0000
4@@ -0,0 +1,29 @@
5+#
6+# Eucalyptus avahi-daemon configuration file
7+#
8+# See avahi-daemon.conf(5) for more information on this configuration
9+# file!
10+#
11+
12+[server]
13+use-ipv4=yes
14+use-ipv6=no
15+
16+[wide-area]
17+enable-wide-area=yes
18+
19+[publish]
20+# Don't publish addresses by default. A specific eucalytpus upstart job
21+# takes care of publishing the CC IP/hostname mapping.
22+# Public IP of running instances are added to the CC which would be
23+# automatically published by avahi-daemon breaking NC installs.
24+# LP: #458904
25+publish-addresses=no
26+
27+[rlimits]
28+rlimit-core=0
29+rlimit-data=4194304
30+rlimit-fsize=0
31+rlimit-nofile=300
32+rlimit-stack=4194304
33+rlimit-nproc=3
34
35=== modified file 'debian/changelog'
36--- debian/changelog 2009-11-02 23:10:25 +0000
37+++ debian/changelog 2009-11-02 23:25:19 +0000
38@@ -11,6 +11,13 @@
39 * debian/eucalyptus-common.eucalyptus.upstart: Add -l to eucalyptus-cloud
40 options so that cloud-output.log is affected by LOGLEVEL (LP: #458001)
41
42+ [ Mathias Gug ]
43+ * debian/eucalyptus-cc.eucalyptus-cc-publication{,-ip}.upstart: add an
44+ upstart job to explicitly publish the IP/CC hostname mapping via avahi
45+ instead of publishing the CC IP address via the service name (LP: #458904).
46+ * debian/avahi-daemon.conf: ship a specific avahi-daemon configuration file
47+ that doesn't publish IP addresses by default. (LP: #458904).
48+
49 -- Thierry Carrez <thierry.carrez@ubuntu.com> Tue, 20 Oct 2009 12:26:19 +0200
50
51 eucalyptus (1.6~bzr931-0ubuntu7) karmic; urgency=low
52
53=== added file 'debian/eucalyptus-cc.eucalyptus-cc-publication-ip.upstart'
54--- debian/eucalyptus-cc.eucalyptus-cc-publication-ip.upstart 1970-01-01 00:00:00 +0000
55+++ debian/eucalyptus-cc.eucalyptus-cc-publication-ip.upstart 2009-11-02 23:25:19 +0000
56@@ -0,0 +1,11 @@
57+description "Eucalyptus cluster controller IP publication"
58+author "Mathias Gug <mathias.gug@canonical.com>"
59+
60+start on started eucalyptus-cc
61+stop on stopping eucalyptus-cc
62+
63+script
64+ . /etc/eucalyptus/eucalyptus.conf
65+ . /etc/eucalyptus/eucalyptus-ipaddr.conf
66+ exec avahi-publish -a $(hostname).local $CC_IP_ADDR
67+end script
68
69=== modified file 'debian/eucalyptus-cc.eucalyptus-cc-publication.upstart'
70--- debian/eucalyptus-cc.eucalyptus-cc-publication.upstart 2009-10-07 19:34:34 +0000
71+++ debian/eucalyptus-cc.eucalyptus-cc-publication.upstart 2009-11-02 23:25:19 +0000
72@@ -1,11 +1,11 @@
73 description "Eucalyptus cluster controller publication"
74 author "Matt Zimmerman <mdz@canonical.com>"
75
76-start on started eucalyptus-cc
77+start on started eucalyptus-cc-publication-ip
78 stop on stopping eucalyptus-cc
79
80 script
81 . /etc/eucalyptus/eucalyptus.conf
82 . /etc/eucalyptus/eucalyptus-ipaddr.conf
83- exec avahi-publish -s $CC_IP_ADDR _eucalyptus._tcp $CC_PORT txtvers=1 protovers=1.5.0 type=cluster
84+ exec avahi-publish -s "Eucalyptus cluster controller" _eucalyptus._tcp $CC_PORT txtvers=1 protovers=1.5.0 type=cluster
85 end script
86
87=== modified file 'debian/rules'
88--- debian/rules 2009-10-14 00:43:55 +0000
89+++ debian/rules 2009-11-02 23:25:19 +0000
90@@ -37,6 +37,10 @@
91 install -D debian/eucalyptus-udeb.finish-install \
92 $(DEB_DESTDIR)/usr/lib/finish-install.d/60eucalyptus-udeb
93
94+install/eucalyptus-cc::
95+ install -D debian/avahi-daemon.conf \
96+ $(DEB_DESTDIR)/etc/eucalyptus/avahi-daemon.conf
97+
98 DEB_DH_INSTALLINIT_ARGS=--noscripts
99
100 binary-install/eucalyptus-nc::
101@@ -47,6 +51,7 @@
102
103 binary-install/eucalyptus-cc::
104 dh_installinit -p$(cdbs_curpkg) --noscripts --name=eucalyptus-cc-publication --noscripts
105+ dh_installinit -p$(cdbs_curpkg) --noscripts --name=eucalyptus-cc-publication-ip --noscripts
106
107 binary-install/eucalyptus-cloud::
108 dh_installinit -p$(cdbs_curpkg) --noscripts --name=eucalyptus-cc-registration --noscripts

Subscribers

People subscribed via source and target branches

to all changes: