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

[Adam Gandelman]

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

=== modified file 'hooks/nova-compute-relations'
--- hooks/nova-compute-relations	2013-04-26 13:06:20 +0000
+++ hooks/nova-compute-relations	2013-04-30 23:50:34 +0000
@@ -137,12 +137,18 @@
 }
 
 function image-service_changed {
-  GLANCE_API_SERVER=`relation-get glance-api-server`
-  if [[ -z $GLANCE_API_SERVER ]] ; then
-    echo "image-service_changed: GLANCE_API_SERVER not yet set. Exit 0 and retry"
+  local api_server=`relation-get glance-api-server`
+  if [[ -z $api_server ]] ; then
+    echo "image-service_changed: api_server not yet set. Exit 0 and retry"
     exit 0
   fi
-  set_or_update glance_api_servers $GLANCE_API_SERVER
+
+  if [[ "$(get_os_codename_package nova-common)" == "essex" ]] ; then
+    # essex needs glance_api_servers urls stripped of protocol.
+    api_server="$(echo $api_server | awk '{gsub(/http:\/\/|https:\/\//,"")}1')"
+  fi
+
+  set_or_update glance_api_servers $api_server
   service_ctl all restart
 }