Merge lp:~wesmason/charms/precise/mongodb/fix-volumes into lp:charms/mongodb

[Wes Mason]

Ensure relation_id() is used to set mountpoint for persistent volume relation

The recent refactor of the charm to re-use the helpers from charmhelpers broke the also-recently-merged persistent volume support by not including the correct relation ID when setting the mountpoint, this fixes that by adding the call to the `relation_id()` helper.

[Charles Butler (lazypower)]

Thanks for the subsequent fix wes!

Sorry I missed this when I did the refactoring. *hattip*

review: Approve

[Charles Butler (lazypower)]

As an addendum to this merge, should this be submitted as a target against the trusty charm as well? I'm sure it has the same issue if it has the volume mount changes present as well.

[Wes Mason (wesmason)]

Yes indeed it should, I apologies I missed this on account of us not haing
moved the service I was testing onto trusty.

I'll push an MP for the trusty charm too as soon as I'm back from PyCon UK.
:-)

On Friday, 19 September 2014, Charles Butler <email address hidden>
wrote:

> As an addendum to this merge, should this be submitted as a target against
> the trusty charm as well? I'm sure it has the same issue if it has the
> volume mount changes present as well.
> --
>
> https://code.launchpad.net/~wesmason/charms/precise/mongodb/fix-volumes/+merge/234670
> You are the owner of lp:~wesmason/charms/precise/mongodb/fix-volumes.
>

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-08-21 14:36:15 +0000
+++ hooks/hooks.py	2014-09-15 11:34:20 +0000
@@ -993,7 +993,7 @@
 def data_relation_joined():
     juju_log("data_relation_joined")
 
-    return(relation_set(
+    return(relation_set(relation_id(),
         {
             'mountpoint': '/srv/juju/mongodb-data'
         }))