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

[Francis Ginther]

Add relationship hooks for handling the jenkaas-slave relationship.

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'}}}}

[Joe Talbott (joetalbott)]

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-06-16 15:39:39 +0000
+++ hooks/actions.py	2015-06-17 13:51:03 +0000
@@ -54,3 +54,8 @@
     hookenv.log('Installing dependency packages')
     fetch.apt_update()
     fetch.apt_install(DEPS_PKGES, options=['--fix-broken', ], fatal=True)
+
+
+def install_slaves(service_name):
+    hookenv.log('Installing slaves')
+    hookenv.log(hookenv.relations())
 
=== added symlink 'hooks/jenkaas-slave-relation-changed'
=== target is u'hooks.py'
=== added symlink 'hooks/jenkaas-slave-relation-joined'
=== target is u'hooks.py'
=== modified file 'hooks/services.py'
--- hooks/services.py	2015-06-16 15:38:14 +0000
+++ hooks/services.py	2015-06-17 13:51:03 +0000
@@ -1,26 +1,46 @@
 from charmhelpers.core import hookenv
 from charmhelpers.core.services.base import ServiceManager
-from charmhelpers.core.services import helpers
+from charmhelpers.core.services.helpers import (
+    RelationContext,
+    render_template,
+)
 
 import actions
 
 
+class MasterToSlaveProvider(RelationContext):
+    """Provide data on the jenkaas-slave relationship."""
+    name = 'jenkaas-slave'
+    interface = 'jenkaas-slave'
+
+    def provide_data(self):
+        return {
+            'master-address': hookenv.unit_get('private-address'),
+            'port': 48484,
+        }
+
+
 def manage():
     config = hookenv.config()
     manager = ServiceManager([
         {
             'service': 'jenkaas',
-            'required_data': [config],
+            'required_data': [
+                config,
+            ],
+            'provided_data': [MasterToSlaveProvider()],
             'data_ready': [
                 actions.basenode,
                 actions.install_jenkins_dep_pkges,
                 actions.install_jenkins,
                 actions.install_plugins,
-                helpers.render_template(
+                render_template(
                     source='upstart.conf',
                     target='/etc/init/jenkaas.conf'),
+                actions.install_slaves,
                 actions.log_start,
             ],
+            'ports': [48484],
         },
     ])
     manager.manage()
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-06-15 18:17:25 +0000
+++ metadata.yaml	2015-06-17 13:51:03 +0000
@@ -4,3 +4,6 @@
 maintainer: 
 description: |
   Runs jenkins server from a given service tarball (provided as  files/jenkaas.tgz).
+provides:
+  jenkaas-slave:
+    interface: jenkaas-slave