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

[Francis Ginther]

Add relationship hooks for handling the jenkaas-slave relationship.

Add relationship hooks for handling the jenkaas-slave relationship.

This doesn't do anything useful yet, but does force the master-address to be available before any of the data_ready actions are executed.

[Joe Talbott (joetalbott)]

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-06-12 22:40:31 +0000
+++ hooks/actions.py	2015-06-17 13:52:32 +0000
@@ -32,7 +32,7 @@
 
 def install_service_dependencies(service_name):
     hookenv.log('Installing service dependencies')
-    fetch.configure_sources(update=True)
+    fetch.apt_update(fatal=True)
     fetch.apt_install(REQUIRED_PACKAGES, fatal=True)
 
 
 
=== 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-12 22:40:31 +0000
+++ hooks/services.py	2015-06-17 13:52:32 +0000
@@ -1,15 +1,41 @@
 from charmhelpers.core import hookenv
 from charmhelpers.core.services.base import ServiceManager
+from charmhelpers.core.services.helpers import RelationContext
 
 import actions
 
 
+class SlaveToMasterProvider(RelationContext):
+    """Provide data on the jenkaas-slave relationship."""
+    name = 'jenkaas-slave'
+    interface = 'jenkaas-slave'
+
+    def provide_data(self):
+        return {
+            'slave-address': hookenv.unit_get('private-address'),
+        }
+
+
+class SlaveToMasterConsumer(RelationContext):
+    """Requirements for the jenkaas-slave relationship."""
+    name = 'jenkaas-slave'
+    interface = 'jenkaas-slave'
+    required_keys = [
+        'master-address',
+        'port',
+    ]
+
+
 def manage():
     config = hookenv.config()
     manager = ServiceManager([
         {
             'service': 'jenkins-slave',
-            'required_data': [config],
+            'required_data': [
+                config,
+                SlaveToMasterConsumer(),
+            ],
+            'provided_data': [SlaveToMasterProvider()],
             'data_ready': [
                 actions.basenode,
                 actions.install_service_dependencies,
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-06-12 22:37:23 +0000
+++ metadata.yaml	2015-06-17 13:52:32 +0000
@@ -6,3 +6,6 @@
 description: |
   Installs the jenkins slave package and connects a jenkins master using
   juju relations.
+requires:
+  jenkaas-slave:
+    interface: jenkaas-slave