Juju Charms Collection
mongodb package

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

  1. Precise Pangolin (12.04)
  2. fix-volumes
  3. Merge into trunk
Proposed by Wes Mason
Status: Merged
Merged at revision: 52
Proposed branch: lp:~wesmason/charms/precise/mongodb/fix-volumes
Merge into: lp:charms/mongodb
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/hooks.py (+1/-1)
To merge this branch: bzr merge lp:~wesmason/charms/precise/mongodb/fix-volumes
Reviewer Review Type Date Requested Status
Charles Butler (community) Approve
Review via email: mp+234670@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Charles Butler (lazypower) wrote :

Thanks for the subsequent fix wes!

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

review: Approve
Revision history for this message
Charles Butler (lazypower) 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.

Revision history for this message
Wes Mason (wesmason) wrote :

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.
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/hooks.py'
2--- hooks/hooks.py 2014-08-21 14:36:15 +0000
3+++ hooks/hooks.py 2014-09-15 11:34:20 +0000
4@@ -993,7 +993,7 @@
5 def data_relation_joined():
6 juju_log("data_relation_joined")
7
8- return(relation_set(
9+ return(relation_set(relation_id(),
10 {
11 'mountpoint': '/srv/juju/mongodb-data'
12 }))

Subscribers

People subscribed via source and target branches