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
=== modified file 'hooks/cinder-hooks'
--- hooks/cinder-hooks 2012-12-05 17:43:54 +0000
+++ hooks/cinder-hooks 2013-03-05 17:38:23 +0000
@@ -141,7 +141,7 @@
141 MONS=`relation-list`141 MONS=`relation-list`
142 mon_hosts=""142 mon_hosts=""
143 for mon in $MONS; do143 for mon in $MONS; do
144 mon_hosts="$mon_hosts `relation-get private-address $mon`:6789"144 mon_hosts="$mon_hosts $(get_ip $(relation-get private-address $mon)):6789"
145 done145 done
146 cat > /etc/ceph/ceph.conf << EOF146 cat > /etc/ceph/ceph.conf << EOF
147[global]147[global]

Subscribers

People subscribed via source and target branches