Merge lp:~dpb/charms/precise/glance/mon-host-workaround into lp:~charmers/charms/precise/glance/trunk

Proposed by David Britton
Status: Rejected
Rejected by: James Page
Proposed branch: lp:~dpb/charms/precise/glance/mon-host-workaround
Merge into: lp:~charmers/charms/precise/glance/trunk
Diff against target: 20 lines (+3/-2)
2 files modified
hooks/glance-relations (+2/-1)
revision (+1/-1)
To merge this branch: bzr merge lp:~dpb/charms/precise/glance/mon-host-workaround
Reviewer Review Type Date Requested Status
Adam Gandelman Pending
Review via email: mp+143401@code.launchpad.net

Description of the change

Workaround for bug #1099900

To post a comment you must log in.
31. By David Britton

Merging up

Unmerged revisions

31. By David Britton

Merging up

30. By David Britton

Adding workaround for #1099900

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/glance-relations'
2--- hooks/glance-relations 2013-01-30 23:14:25 +0000
3+++ hooks/glance-relations 2013-01-30 23:28:21 +0000
4@@ -158,7 +158,8 @@
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+ # get_ip workaround for lp: #1099900
10+ mon_hosts="$mon_hosts $(get_ip $(relation-get private-address $mon)):6789"
11 done
12 cat > /etc/ceph/ceph.conf << EOF
13 [global]
14
15=== modified file 'revision'
16--- revision 2013-01-30 23:14:25 +0000
17+++ revision 2013-01-30 23:28:21 +0000
18@@ -1,1 +1,1 @@
19-79
20+81

Subscribers

People subscribed via source and target branches

to all changes: