Merge lp:~timrchavez/charms/precise/jenkins-slave/jenkins-slave-fix-slave-relation-joined into lp:charms/jenkins-slave

[Timothy R. Chavez]

Set 'slaveaddress' in the 'slave-relation-joined' hook because the
Jenkins master requires (assumes, even) that it is. If 'slaveaddress'
is not set by the slave when a relation is added between the Jenkins
master and Jenkins slave, the Jenkins master will instead pass an empty
string to the 'addnode' helper script, causing breakage, and resulting in
a 'master-relation-changed' hook error on the Jenkins master side of the
relation.

[Marco Ceppi (marcoceppi)]

LGTM +1

review: Approve

=== modified file 'hooks/slave-relation-joined'
--- hooks/slave-relation-joined	2012-07-27 09:52:29 +0000
+++ hooks/slave-relation-joined	2014-04-09 17:00:12 +0000
@@ -17,3 +17,4 @@
 relation-set executors=$noexecutors
 relation-set labels="$labels"
 relation-set slavehost=$slavehost
+relation-set slaveaddress=`unit-get private-address`

=== modified file 'revision'
--- revision	2012-07-31 13:47:53 +0000
+++ revision	2014-04-09 17:00:12 +0000
@@ -1,1 +1,1 @@
-8
+9