Merge lp:~james-page/charms/precise/openstack-dashboard/theme-option into lp:~openstack-charmers/charms/precise/openstack-dashboard/ha-support

[James Page]

Add support to turn on/off the ubuntu theme. Defaults on on.

=== modified file 'config.yaml'
--- config.yaml	2013-03-12 13:36:17 +0000
+++ config.yaml	2013-03-22 11:39:55 +0000
@@ -74,3 +74,7 @@
         type: string
         default: "no"
         description: Show Django debug messages.
+    ubuntu-theme:
+        type: string
+        default: "yes"
+        description: Use Ubuntu theme for the dashboard.
 
=== modified file 'hooks/horizon-common'
--- hooks/horizon-common	2013-03-12 13:36:17 +0000
+++ hooks/horizon-common	2013-03-22 11:39:55 +0000
@@ -3,7 +3,7 @@
 
 CHARM="openstack-dashboard"
 
-PACKAGES="openstack-dashboard openstack-dashboard-ubuntu-theme python-keystoneclient python-memcache memcached haproxy"
+PACKAGES="openstack-dashboard python-keystoneclient python-memcache memcached haproxy"
 LOCAL_SETTINGS="/etc/openstack-dashboard/local_settings.py"
 
 if [[ -e "$CHARM_DIR/lib/openstack-common" ]] ; then
 
=== modified file 'hooks/horizon-relations'
--- hooks/horizon-relations	2013-03-13 11:08:28 +0000
+++ hooks/horizon-relations	2013-03-22 11:39:55 +0000
@@ -120,6 +120,12 @@
     set_or_update DEBUG True
   fi
 
+  if [ "$(config-get ubuntu-theme)" != "yes" ]; then
+    apt-get -y purge openstack-dashboard-ubuntu-theme || :
+  else
+    apt-get -y install openstack-dashboard-ubuntu-theme
+  fi
+
   # Reconfigure Apache Ports
   configure_apache "80:70" "443:433"
   service apache2 restart