Merge lp:~ahasenack/charms/precise/openstack-dashboard/use-charm-dir into lp:~openstack-charmers/charms/precise/openstack-dashboard/ha-support

[Andreas Hasenack]

This branch changes the charm to use CHARM_DIR instead of a hardcoded path. That makes it compatible with both juju-core and juju.

=== modified file 'hooks/horizon-common'
--- hooks/horizon-common	2013-03-22 11:23:33 +0000
+++ hooks/horizon-common	2013-04-26 20:49:42 +0000
@@ -5,11 +5,12 @@
 
 PACKAGES="openstack-dashboard python-keystoneclient python-memcache memcached haproxy"
 LOCAL_SETTINGS="/etc/openstack-dashboard/local_settings.py"
+HOOKS_DIR="$CHARM_DIR/hooks"
 
-if [[ -e "$CHARM_DIR/lib/openstack-common" ]] ; then
-  . $CHARM_DIR/lib/openstack-common
+if [[ -e "$HOOKS_DIR/lib/openstack-common" ]] ; then
+  . $HOOKS_DIR/lib/openstack-common
 else
-  juju-log "ERROR: Couldn't load $CHARM_DIR/lib/openstack-common." && exit 1
+  juju-log "ERROR: Couldn't load $HOOKS_DIR/lib/openstack-common." && exit 1
 fi
 
 set_or_update() {

=== modified file 'hooks/horizon-relations'
--- hooks/horizon-relations	2013-04-08 16:17:03 +0000
+++ hooks/horizon-relations	2013-04-26 20:49:42 +0000
@@ -1,13 +1,13 @@
 #!/bin/bash
 set -e
 
-CHARM_DIR=$(dirname $0)
+HOOKS_DIR="$CHARM_DIR/hooks"
 ARG0=${0##*/}
 
-if [[ -e $CHARM_DIR/horizon-common ]] ; then
-  . $CHARM_DIR/horizon-common
+if [[ -e $HOOKS_DIR/horizon-common ]] ; then
+  . $HOOKS_DIR/horizon-common
 else
-  echo "ERROR: Could not load horizon-common from $CHARM_DIR"
+  echo "ERROR: Could not load horizon-common from $HOOKS_DIR"
 fi
 
 function install_hook {

=== modified file 'hooks/lib/openstack-common'
--- hooks/lib/openstack-common	2013-03-15 18:43:15 +0000
+++ hooks/lib/openstack-common	2013-04-26 20:49:42 +0000
@@ -750,7 +750,7 @@
      exit 1
   fi
   # our default unit_path
-  unit_path="/var/lib/juju/units/${JUJU_UNIT_NAME/\//-}/charm/scripts/scriptrc"
+  unit_path="$CHARM_DIR/scripts/scriptrc"
   echo $unit_path
   tmp_rc="/tmp/${JUJU_UNIT_NAME/\//-}rc"
 
@@ -759,7 +759,7 @@
   do
     if `echo $env_var | grep -q script_path`; then
        # well then we need to reset the new unit-local script path
-       unit_path="/var/lib/juju/units/${JUJU_UNIT_NAME/\//-}/charm/${env_var/script_path=/}"
+       unit_path="$CHARM_DIR/${env_var/script_path=/}"
     else
        echo "export $env_var" >> $tmp_rc
     fi

=== modified file 'revision'
--- revision	2013-03-27 14:59:04 +0000
+++ revision	2013-04-26 20:49:42 +0000
@@ -1,1 +1,1 @@
-27
+28