Merge lp:~gandelman-a/charms/oneiric/nova-cloud-controller/custom_ppa into lp:~charmers/charms/oneiric/nova-cloud-controller/trunk

[Adam Gandelman]

[Juan L. Negron (negronjl)]

Reviewing this now.

-Juan

[Juan L. Negron (negronjl)]

Approved and Merged.

-Juan

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2011-10-26 22:22:12 +0000
+++ config.yaml	2011-12-16 02:43:25 +0000
@@ -2,7 +2,7 @@
   nova-release:
     default: distro
     type: string
-    description: Nova PPA from which to install. (distro, trunk, milestone, milestone-proposed)
+    description: Nova PPA from which to install. (distro, trunk, milestone, milestone-proposed or ppa:somewhere/else)
   nova-config:
     default: /etc/nova/nova.conf
     type: string

=== modified file 'hooks/nova-cloud-controller-common'
--- hooks/nova-cloud-controller-common	2011-11-15 01:00:20 +0000
+++ hooks/nova-cloud-controller-common	2011-12-16 02:43:25 +0000
@@ -114,11 +114,24 @@
 }
 
 function add_ppa {
-  # don't setup PPA, install from archive
+  # Install from archive instead of PPA.
   [[ $PPA == "distro" ]] && return 0
-  juju-log "nova-cloud-controller: Configuring PPA access for $PPA"
   . /etc/lsb-release
-  PPA_URL="deb http://ppa.launchpad.net/nova-core/$PPA/ubuntu $DISTRIB_CODENAME main"
-  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."
 }