Merge lp:~marcoceppi/charms/precise/mysql/lp1187182 into lp:charms/mysql

[Marco Ceppi]

Fixes master/slave relation

=== modified file 'hooks/master-relation-changed'
--- hooks/master-relation-changed	2013-02-12 17:54:29 +0000
+++ hooks/master-relation-changed	2013-06-05 15:59:44 +0000
@@ -2,7 +2,7 @@
 #
 # Master side of master/slave replication
 
-set -e
+set -ex
 
 . /usr/share/charm-helper/sh/net.sh
 
@@ -18,11 +18,11 @@
         rhost=$(relation-get -r $r hostname $runit)
         if [ -n "$rhost" ] ; then
             rhosts=${rhosts},$rhost
-        fi
-        if [ "$runit" = "$JUJU_REMOTE_UNIT" ] ; then
-            remote_ip=$rhost
-            if ! ch_is_ip $remote_ip ; then
-                remote_ip=$(ch_get_ip $remote_ip)
+            if [ "$runit" = "$JUJU_REMOTE_UNIT" ] ; then
+                remote_ip=$rhost
+                if ! ch_is_ip $remote_ip ; then
+                    remote_ip=$(ch_get_ip $remote_ip)
+                fi
             fi
         fi
     done