Comment 19 for bug 458904

The workaround discussed by Thierry and Martin in comment 11-14 is working as expected:

1. Update avahi-daemon upstart job to use /etc/eucalytpus/avahi-daemon.conf if is there:

=== modified file 'debian/avahi-daemon.upstart'
--- debian/avahi-daemon.upstart 2009-09-15 03:33:13 +0000
+++ debian/avahi-daemon.upstart 2009-10-30 21:07:05 +0000
@@ -12,4 +12,8 @@
 expect daemon
 respawn

-exec avahi-daemon -D
+script
+ opts="-D"
+ [ -e "/etc/eucalyptus/avahi-daemon.conf" ] && opts="${opts} -f /etc/eucalyptus/avahi-daemon.conf"
+ exec avahi-daemon ${opts}
+end script

2. Ship /etc/eucalyptus/avahi-daemon.conf in the eucalyptus-cc package that disables address publishing:

publish-addresses=no

3. Add an eucalyptus-cc-publication-ip upstart job to publish the CC IP/hostname mapping:

exec avahi-publish -a $(hostname).local $CC_IP_ADDR

With these changes, running new instances with public IPs doesn't change the IP address returned by euca_find_cluster for an NC iso installation.