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

Proposed by Timothy R. Chavez
Status: Merged
Merged at revision: 12
Proposed branch: lp:~timrchavez/charms/precise/jenkins-slave/jenkins-slave-fix-slave-relation-joined
Merge into: lp:charms/jenkins-slave
Diff against target: 15 lines (+2/-1)
2 files modified
hooks/slave-relation-joined (+1/-0)
revision (+1/-1)
To merge this branch: bzr merge lp:~timrchavez/charms/precise/jenkins-slave/jenkins-slave-fix-slave-relation-joined
Reviewer Review Type Date Requested Status
Marco Ceppi (community) Approve
Review via email:

Description of the change

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

To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) wrote :


review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/slave-relation-joined'
2--- hooks/slave-relation-joined 2012-07-27 09:52:29 +0000
3+++ hooks/slave-relation-joined 2014-04-09 17:00:12 +0000
4@@ -17,3 +17,4 @@
5 relation-set executors=$noexecutors
6 relation-set labels="$labels"
7 relation-set slavehost=$slavehost
8+relation-set slaveaddress=`unit-get private-address`
10=== modified file 'revision'
11--- revision 2012-07-31 13:47:53 +0000
12+++ revision 2014-04-09 17:00:12 +0000
13@@ -1,1 +1,1 @@


People subscribed via source and target branches

to all changes: