Merge lp:~gandelman-a/charms/precise/openstack-dashboard/fixes into lp:~charmers/charms/precise/openstack-dashboard/trunk

[Adam Gandelman]

Some fixes for handling of repo URLs via 'openstack-origin' config. Courtesy of James Page, but I seem to have lost write access to these branches to merge myself.

=== modified file 'hooks/horizon-relations'
--- hooks/horizon-relations	2012-10-12 17:30:30 +0000
+++ hooks/horizon-relations	2012-11-29 00:14:30 +0000
@@ -11,7 +11,7 @@
 fi
 
 function install_hook {
-  configure_install_source $(config-get openstack-origin)
+  configure_install_source "$(config-get openstack-origin)"
   apt-get update
   juju-log "$CHARM: Installing $PACKAGES."
   DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES

=== modified file 'hooks/lib/openstack-common'
--- hooks/lib/openstack-common	2012-10-12 20:44:22 +0000
+++ hooks/lib/openstack-common	2012-11-29 00:14:30 +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
 }