Merge deb src handling + grizzly CA support from James Page.

hooks/glance-relations

@@ -13,7 +13,7 @@ function install_hook {
   juju-log "Installing glance 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
   apt-get -y install $PACKAGES || exit 1

hooks/lib/openstack-common

@@ -78,7 +78,7 @@ function configure_install_source {
         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 @@ get_os_codename_install_source() {
       "oneiric") codename="diablo" ;;
       "precise") codename="essex" ;;
       "quantal") codename="folsom" ;;
+      "raring")  codename="grizzly" ;;
     esac
   fi
 
@@ -141,9 +142,21 @@ get_os_codename_install_source() {
       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 $CODENAME; do
+      if echo $rel | grep -q $cname; then
+        codename=$cname
+      fi
+    done
+  fi
   echo $codename
 }