Merge lp:~gandelman-a/charms/oneiric/glance/custom_ppa into lp:~charmers/charms/oneiric/glance/trunk

[Adam Gandelman]

[Juan L. Negron (negronjl)]

Reviewing this now.

-Juan

[Juan L. Negron (negronjl)]

Approved ... Merged.

-Juan

=== modified file 'config.yaml'
--- config.yaml	2011-09-16 17:34:31 +0000
+++ config.yaml	2011-12-16 02:48:23 +0000
@@ -2,7 +2,7 @@
   glance-release:
     default: distro
     type: string
-    description: Glance PPA from which to install. (distro, trunk, milestone, milestone-proposed)
+    description: Glance PPA from which to install. (distro, trunk, milestone, milestone-proposed or ppa:somewhere/else)
   api-config:
     default: /etc/glance/glance-api.conf
     type: string

=== modified file 'hooks/glance-common'
--- hooks/glance-common	2011-12-02 23:33:07 +0000
+++ hooks/glance-common	2011-12-16 02:48:23 +0000
@@ -71,8 +71,20 @@
   # Install from archive instead of PPA.
   [[ $PPA == "distro" ]] && return 0
   . /etc/lsb-release
-  juju-log "glance: Setting up PPA for $PPA"
   [[ -z $PPA ]] && return 0
-  PPA_URL="deb http://ppa.launchpad.net/nova-core/$PPA/ubuntu $DISTRIB_CODENAME main"
-  add-apt-repository "$PPA_URL" || exit 1
+  # if referenced by name, setup ppa to upstream PPAs
+  if [[ "$PPA" == "trunk" ]] ||
+     [[ "$PPA" == "milestone" ]] ||
+     [[ "$PPA" == "milestone-proposed" ]] ; then 
+      juju-log "glance: Configuring installation from upstream PPA ($PPA)"
+      PPA_URL="deb http://ppa.launchpad.net/glance-core/$PPA/ubuntu $DISTRIB_CODENAME main"
+      add-apt-repository "$PPA_URL" || exit 1
+      return
+  fi
+  if [[ "${PPA:0:4}" == "ppa:" ]] ; then
+    juju-log "glance: Configuring installation from custom PPA ($PPA)"
+    add-apt-repository -y "$PPA" || exit 1
+    return
+  fi
+  juju-log "glance: No PPA specified. Falling back to installation from Ubuntu archive."
 }

=== modified file 'hooks/glance-relations'
--- hooks/glance-relations	2011-12-02 23:33:07 +0000
+++ hooks/glance-relations	2011-12-16 02:48:23 +0000
@@ -10,7 +10,7 @@
 fi
 
 function install_hook {
-  juju-log "Installing nova packages"
+  juju-log "Installing glance packages"
   apt-get -y install python-software-properties || exit 1
 
   add_ppa