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

[Adam Gandelman]

If nova-cloud-controller is running cloud-compute-relation-* before its executed any identity-service changed, nova-c-c will not pass all required data for quantuam config via the cloud-compute relation. Ensure we have everything we need before attempting to set_or_update various identity service bits.

[James Page (james-page)]

review: Approve

=== modified file 'hooks/nova-compute-common'
--- hooks/nova-compute-common	2013-05-20 11:28:14 +0000
+++ hooks/nova-compute-common	2013-05-21 05:28:05 +0000
@@ -127,19 +127,31 @@
       set_or_update ec2_dmz_host $ec2_host
       ;;
     "Quantum")
-      local keystone_host=$(relation-get keystone_host)
-      [[ -z $keystone_host ]] && juju-log "nova-compute: Missing keystone host" \
-        && exit 0
-      # XXX(adam_g): Need to check for unset values here, otherwise it errors
-      # if nova-c-c<->nova-compute is made before keystone<->nova-c-c
+      local keystone_host="$(relation-get keystone_host)"
+      local auth_port="$(relation-get auth_port)"
+      local quantum_url="$(relation-get quantum_url)"
+      local quantum_admin_tenant_name="$(relation-get service_tenant)"
+      local quantum_admin_username="$(relation-get service_username)"
+      local quantum_admin_password="$(relation-get service_password)"
+
+      # might end up here before nova-c-c has processed keystone hooks
+      [[ -z "$keystone_host" ]] ||
+      [[ -z "$auth_port" ]] ||
+      [[ -z "$quantum_url" ]] ||
+      [[ -z "$quantum_admin_tenant_name" ]] ||
+      [[ -z "$quantum_admin_username" ]] ||
+      [[ -z "$quantum_admin_password" ]] &&
+        juju-log "nova-compute: Missing required data for Quantum config." &&
+          exit 0
       set_or_update "network_api_class" "nova.network.quantumv2.api.API"
       set_or_update "quantum_auth_strategy" "keystone"
-      set_or_update "quantum_url" "$(relation-get quantum_url)"
-      set_or_update "quantum_admin_tenant_name" "$(relation-get service_tenant)"
-      set_or_update "quantum_admin_username" "$(relation-get service_username)"
-      set_or_update "quantum_admin_password" "$(relation-get service_password)"
+      set_or_update "quantum_url" "$quantum_url"
+      set_or_update "quantum_admin_tenant_name" "$quantum_admin_tenant_name"
+      set_or_update "quantum_admin_username" "$quantum_admin_username"
+      set_or_update "quantum_admin_password" "$quantum_admin_password"
       set_or_update "quantum_admin_auth_url" \
-                    "http://$(relation-get keystone_host):$(relation-get auth_port)/v2.0"
+                    "http://$keystone_host:$auth_port/v2.0"
+
       local cur=$(get_os_codename_package "nova-common")
       if dpkg --compare-versions $(get_os_version_codename $cur) gt '2012.2'; then
         # Grizzly onwards supports metadata proxy so forcing use of config