Merge lp:~gandelman-a/charms/precise/nova-compute/trunk into lp:~charmers/charms/precise/nova-compute/trunk

[Adam Gandelman]

Adds nova-api to run on compute nodes to serve as a local meta data service to the instances running on that host.

=== modified file 'config.yaml'
--- config.yaml	2011-09-30 22:52:20 +0000
+++ config.yaml	2012-01-09 15:31:23 +0000
@@ -26,7 +26,7 @@
   virt-type:
     default: kvm
     type: string
-    description: "Virtualization flavor. Supported: kvm, xen, uml, lxc"
+    description: "Virtualization flavor. Supported: kvm, xen, uml, lxc. qemu"
 
   # needed if using flatmanager
   bridge-interface:
 
=== modified file 'hooks/nova-compute-common'
--- hooks/nova-compute-common	2011-10-12 06:22:46 +0000
+++ hooks/nova-compute-common	2012-01-09 15:31:23 +0000
@@ -1,5 +1,5 @@
 #!/bin/bash
-SERVICES="nova-compute nova-network"
+SERVICES="nova-compute nova-network nova-api"
 NOVA_RELEASE=$(config-get nova-release)
 NOVA_CONF=$(config-get nova-config)
 RABBIT_USER=$(config-get rabbit-user)
@@ -121,11 +121,23 @@
 }
 
 function add_ppa {
-  # don't setup PPA, install from archive
+  # Install from archive instead of PPA.
   [[ $PPA == "distro" ]] && return 0
-  juju-log "nova-compute: Configuring PPA access for $PPA"
   . /etc/lsb-release
-  PPA_URL="deb http://ppa.launchpad.net/nova-core/$PPA/ubuntu $DISTRIB_CODENAME main"
-  echo "Executing: add-apt-repository \"$PPA_URL\"" || exit 1
-  add-apt-repository "$PPA_URL" || exit 1
+  [[ -z $PPA ]] && return 0
+  # if referenced by name, setup ppa to upstream PPAs
+  if [[ "$PPA" == "trunk" ]] ||
+     [[ "$PPA" == "milestone" ]] ||
+     [[ "$PPA" == "milestone-proposed" ]] ; then
+      juju-log "nova: Configuring installation from upstream PPA ($PPA)"
+      PPA_URL="deb http://ppa.launchpad.net/nova-core/$PPA/ubuntu $DISTRIB_CODENAME main"
+      add-apt-repository "$PPA_URL" || exit 1
+      return
+  fi
+  if [[ "${PPA:0:4}" == "ppa:" ]] ; then
+    juju-log "nova: Configuring installation from custom PPA ($PPA)"
+    add-apt-repository -y "$PPA" || exit 1
+    return
+  fi
+  juju-log "nova: No PPA specified. Falling back to installation from Ubuntu archive."
 }
 
=== modified file 'hooks/nova-compute-relations'
--- hooks/nova-compute-relations	2011-10-12 06:22:46 +0000
+++ hooks/nova-compute-relations	2012-01-09 15:31:23 +0000
@@ -11,7 +11,7 @@
 function install_hook {
   [[ -z $VIRT_TYPE ]] && VIRT_TYPE="kvm"
   case $VIRT_TYPE in
-    "kvm") COMPUTE_PKG="nova-compute-kvm";;
+    "kvm"|"qemu") COMPUTE_PKG="nova-compute-kvm";;
     "xen") COMPUTE_PKG="nova-compute-xen";;
     "uml") COMPUTE_PKG="nova-compute-uml";;
     "lxc") COMPUTE_PKG="nova-compute-lxc";;
@@ -20,7 +20,13 @@
   apt-get -y install python-software-properties || exit 1
   add_ppa
   apt-get update || exit 1
-  apt-get -y install $COMPUTE_PKG nova-network || exit 1
+  apt-get -y install $COMPUTE_PKG nova-api nova-network || exit 1
+
+  # there is no nova-compute-qemu pkg. Install kvm and reconfigure
+  # manually for qemu.
+  if [[ "$VIRT_TYPE" == "qemu" ]] ; then
+    sed -i 's/\(\-\-libvirt_type=\).*/\1qemu/g' /etc/nova/nova-compute.conf
+  fi
 
   # XXX sudo on the juju sample AMI doesnt function
   # as it should (doesn't include suoders.d/*). do this
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2011-10-12 06:22:46 +0000
+++ metadata.yaml	2012-01-09 15:31:23 +0000
@@ -15,7 +15,5 @@
     interface: rabbitmq
   image-service:
     interface: glance
-  cloud-controller:
-    interface: nova
   nova-network:
     interface: nova