Merge lp:~gandelman-a/charms/precise/cinder/lp1099900 into lp:charms/raring/cinder

Proposed by Adam Gandelman
Status: Merged
Merged at revision: 19
Proposed branch: lp:~gandelman-a/charms/precise/cinder/lp1099900
Merge into: lp:charms/raring/cinder
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/cinder-hooks (+1/-1)
To merge this branch: bzr merge lp:~gandelman-a/charms/precise/cinder/lp1099900
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+151812@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/cinder-hooks'
2--- hooks/cinder-hooks 2012-12-05 17:43:54 +0000
3+++ hooks/cinder-hooks 2013-03-05 17:38:23 +0000
4@@ -141,7 +141,7 @@
5 MONS=`relation-list`
6 mon_hosts=""
7 for mon in $MONS; do
8- mon_hosts="$mon_hosts `relation-get private-address $mon`:6789"
9+ mon_hosts="$mon_hosts $(get_ip $(relation-get private-address $mon)):6789"
10 done
11 cat > /etc/ceph/ceph.conf << EOF
12 [global]

Subscribers

People subscribed via source and target branches