Merge lp:~cprov/charms/trusty/adt-image-mapper/bug-1409762 into lp:~canonical-ci-engineering/charms/trusty/adt-image-mapper/trunk

[Celso Providelo]

Replicating workaround for bug #1409763 (blindly setting website relation via action, since RelationContext.provide_data is not working as expect).

Replicating workaround for bug #1409763 (blindly setting website relation via action, since RelationContext.provide_data is not working as expect).

[Para Siva (psivaa)]

+1

review: Approve

[Para Siva (psivaa)]

(The bug id is bug #1409763 i suppose :))

[Celso Providelo (cprov)]

Psivaa,

Yes, got the bug number wrong in several places (branch name, commit message, MP description) ...

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-03-13 16:53:41 +0000
+++ hooks/actions.py	2015-03-17 04:35:31 +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 13:06:46 +0000
+++ hooks/services.py	2015-03-17 04:35:31 +0000
@@ -23,6 +23,7 @@
                 helpers.render_template(
                     source='upstart.conf',
                     target='/etc/init/adt-image-mapper.conf'),
+                actions.publish_website_relation_data,
                 actions.log_start,
             ],
         },