Merge lp:~gandelman-a/charms/precise/nova-cloud-controller/fixes into lp:~charmers/charms/precise/nova-cloud-controller/trunk

[Adam Gandelman]

* Some fixes for handling of repo URLs via 'openstack-origin' config. Courtesy of James Page.

* Allows the nova-cloud-controller service to inform nova-compute, via the cloud-compute relation, of the configured volume service so nova-compute can configure itself accordingly. The volume service changes depending on what has been deployed and related (nova-volume or cinder).

I seem to have lost write access to these branches to merge myself.

[Juan L. Negron (negronjl)]

Reviewing this now.

-Juan

[Juan L. Negron (negronjl)]

I fixed the ensemble left-overs from metadata.yaml.

charm proof results:
W: no README file
I: relation cloud-controller has no hooks

The README file should be added to this ... Adam? :)

Other than that .. the changes are sane and seem to be working for me.

Approved.

Merging.

Thanks,

Juan

review: Approve

=== modified file 'hooks/lib/openstack-common'
--- hooks/lib/openstack-common	2012-10-12 19:37:13 +0000
+++ hooks/lib/openstack-common	2012-11-29 00:16:22 +0000
@@ -78,7 +78,7 @@
         juju-log "$CHARM No repository key specified"
         url="$src"
       fi
-      add-apt-repository -y "$url"
+      echo $url > /etc/apt/sources.list.d/juju_deb.list
     fi
     return 0
   fi
@@ -129,6 +129,7 @@
       "oneiric") codename="diablo" ;;
       "precise") codename="essex" ;;
       "quantal") codename="folsom" ;;
+      "raring")  codename="grizzly" ;;
     esac
   fi
 
@@ -141,9 +142,21 @@
       case "$ca_rel" in
         "folsom"|"folsom/updates"|"folsom/proposed"|"folsom/staging")
           codename="folsom" ;;
+        "grizzly"|"grizzly/updates"|"grizzly/proposed"|"grizzy/staging")
+          codename="grizly" ;;
       esac
     fi
   fi
+
+  # have a guess based on the deb string provided
+  if [[ "${rel:0:3}" == "deb" ]]; then
+    CODENAMES="diablo essex folsom grizzly"
+    for cname in $CODENAMES; do
+      if echo $rel | grep -q $cname; then
+        codename=$cname
+      fi
+    done
+  fi
   echo $codename
 }
 

=== modified file 'hooks/nova-cloud-controller-relations'
--- hooks/nova-cloud-controller-relations	2012-10-12 19:37:13 +0000
+++ hooks/nova-cloud-controller-relations	2012-11-29 00:16:22 +0000
@@ -12,7 +12,7 @@
 function install_hook {
   juju-log "$CHARM: Installing nova packages"
   apt-get -y install python-software-properties || exit 1
-  configure_install_source $(config-get openstack-origin)
+  configure_install_source "$(config-get openstack-origin)"
   apt-get update || exit 1
 
   DEBIAN_FRONTEND=noninteractive apt-get -y \
@@ -220,8 +220,8 @@
   # configured in keystone.
   if [[ "$svc" == "nova-volume" ]] ; then
     apt-get -y install nova-api-os-volume
-    nova_vol_url="http://$(unit-get private-address):8776/v1/\$(tenant_id)s"
-    r_ids=$(relation-ids identity-service)
+    local nova_vol_url="http://$(unit-get private-address):8776/v1/\$(tenant_id)s"
+    local r_ids=$(relation-ids identity-service)
     for id in $r_ids ; do
       juju-log "$CHARM: Registering new endpoint for nova-volume API on "\
                "existing identity-service relation: $id"
@@ -233,6 +233,15 @@
         nova-volume_internal_url="$nova_vol_url"
     done
   fi
+
+  if [[ "$svc" == "cinder" ]] ; then
+    # Compute nodes need to be notified to set their volume
+    # driver accordingly.
+    r_ids=$(relation-ids cloud-compute)
+    for id in $r_ids ; do
+      relation-set -r $id volume_service="cinder"
+    done
+  fi
 }
 
 compute_joined() {
@@ -240,6 +249,14 @@
   # nova-compute should configure itself accordingly.
   relation-set network_manager=$(config-get network-manager)
   relation-set ec2_host=$(unit-get private-address)
+
+  # Compute's volume driver is dependent on volume service deployed.
+  local r_ids=$(relation-ids cinder-volume-service)
+  if [[ -n "$r_ids" ]] ; then
+    relation-set volume_service="cinder"
+  else
+    relation-set volume_service="nova-volume"
+  fi
 }
 
 arg0=$(basename $0)