Juju Charms Collection
nova-cloud-controller package

Merge lp:~gandelman-a/charms/precise/nova-cloud-controller/essex_fix into lp:~openstack-charmers/charms/precise/nova-cloud-controller/ha-support

  1. Precise Pangolin (12.04)
  2. essex_fix
  3. Merge into ha-support
Proposed by Adam Gandelman
Status: Merged
Merged at revision: 73
Proposed branch: lp:~gandelman-a/charms/precise/nova-cloud-controller/essex_fix
Merge into: lp:~openstack-charmers/charms/precise/nova-cloud-controller/ha-support
Diff against target: 16 lines (+6/-0)
1 file modified
hooks/nova-cloud-controller-relations (+6/-0)
To merge this branch: bzr merge lp:~gandelman-a/charms/precise/nova-cloud-controller/essex_fix
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+161739@code.launchpad.net

Description of the change

Essex expects glance_api_servers URLs to not include the protocol portion of the url (eg, https:// or https://)

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/nova-cloud-controller-relations'
2--- hooks/nova-cloud-controller-relations 2013-04-25 19:46:08 +0000
3+++ hooks/nova-cloud-controller-relations 2013-04-30 23:50:33 +0000
4@@ -200,6 +200,12 @@
5 local api_server=$(relation-get glance-api-server)
6 [[ -z $api_server ]] &&
7 juju-log "$CHARM - image-service_changed: Peer not ready?" && exit 0
8+
9+ if [[ "$(get_os_codename_package nova-common)" == "essex" ]] ; then
10+ # essex needs glance_api_servers urls stripped of protocol.
11+ api_server="$(echo $api_server | awk '{gsub(/http:\/\/|https:\/\//,"")}1')"
12+ fi
13+
14 set_or_update glance_api_servers $api_server
15 set_or_update image_service "nova.image.glance.GlanceImageService"
16 determine_services && service_ctl all restart

Subscribers

People subscribed via source and target branches