Juju Charms Collection
jenkaas package

Merge lp://staging/~fginther/charms/trusty/jenkaas/add-slave-relation into lp://staging/~canonical-ci-engineering/charms/trusty/jenkaas/trunk

Proposed by Francis Ginther on 2015-06-17

Status:	Merged
Approved by:	Francis Ginther on 2015-06-17
Approved revision:	23
Merged at revision:	5
Proposed branch:	lp://staging/~fginther/charms/trusty/jenkaas/add-slave-relation
Merge into:	lp://staging/~canonical-ci-engineering/charms/trusty/jenkaas/trunk
Diff against target:	81 lines (+31/-3) 3 files modified hooks/actions.py (+5/-0) hooks/services.py (+23/-3) metadata.yaml (+3/-0)
To merge this branch:	bzr merge lp://staging/~fginther/charms/trusty/jenkaas/add-slave-relation
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Joe Talbott (community)		2015-06-17	Approve on 2015-06-17
Review via email: mp+262219@code.staging.launchpad.net

Commit message

Add relationship hooks for handling the jenkaas-slave relationship.

Description of the change

Add relationship hooks and boilerplate for handling the jenkaas-slave relationship.

This doesn't do anything useful yet, just accepts the relationship from a jenkaas-slave. install_slaves() will report:

{'jenkaas-slave': {u'jenkaas-slave:0': {'jenkaas/0': {u'private-address': u'10.25.176.81', u'master-address': u'10.25.176.81', u'port': u'48484'}, u'jenkaas-slave/0': {u'private-address': u'10.25.176.82', u'slave-address': u'10.25.176.82'}}}}