Merge lp:~cprov/charms/trusty/adt-cloud-service/bug-1409763 into lp:~canonical-ci-engineering/charms/trusty/adt-cloud-service/trunk

[Celso Providelo]

Implement a service action for blindly setting existing website relation data because RelationContext.provide_data() is not being properly called. See bug #1409763 for more info.

Implement a service action for blindly setting existing website relation data because RelationContext.provide_data() is not being properly called. See bug #1409763 for more info.

The side-effect of doing it is that our mojo spec manifest will have to deploy services, deploy relations and then deploy services again (so the action will be triggered when there is already an established relation) ... odd, but will work until the before mentioned bug gets fixed on charmhelpers.

That's what we get for using cutting-edge nice features :-(

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

[Francis Ginther (fginther)]

approve

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-03-13 02:42:53 +0000
+++ hooks/actions.py	2015-03-16 21:58:42 +0000
@@ -78,13 +78,21 @@
         host.mkdir(LOG_DIR, WSGI_USER, WSGI_GROUP, perms=0755)
 
 
-class WebsiteRelation(helpers.RelationContext):
-    name = 'website'
-    interface = 'http'
+def publish_website_relation_data(service_name):
+    # Due to Bug #1409763, this functionality is as action rather than the
+    # provided_data below.
+    for relid in hookenv.relation_ids('website'):
+        hookenv.log(30 * '*')
+        hookenv.log('Hack for #1409763: {}'.format(relid))
+        hookenv.log(30 * '*')
+        hookenv.relation_set(
+            relid, host=hookenv.unit_get('private-address'), port=8000)
+
+
+class WebsiteRelation(helpers.HttpRelation):
 
     def provide_data(self):
-        data = {
-            'hostname': hookenv.unit_private_ip(),
-            'port': 8000,
-        }
+        hookenv.log('Providing Website relation data.')
+        data = super(WebsiteRelation, self).provide_data()
+        data['port'] = 8000
         return data

=== modified file 'hooks/services.py'
--- hooks/services.py	2015-03-13 02:42:53 +0000
+++ hooks/services.py	2015-03-16 21:58:42 +0000
@@ -23,6 +23,7 @@
                 helpers.render_template(
                     source='upstart.conf',
                     target='/etc/init/adt-cloud-service.conf'),
+                actions.publish_website_relation_data,
                 actions.log_start,
             ],
         },