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

[Andreas Hasenack]

This change makes the charm use CHARM_DIR instead of a hardcoded path for the location of the charm directory. In this way, it can be deployed by both juju and juju-core.

[lp:~ahasenack/charms/precise/swift-storage/use-charm-dir]

27. By Andreas Hasenack on 2013-04-26

Bump revision

=== modified file 'hooks/lib/openstack-common'
--- hooks/lib/openstack-common	2013-03-18 18:13:07 +0000
+++ hooks/lib/openstack-common	2013-04-26 21:13:28 +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 'hooks/swift-storage-node-common'
--- hooks/swift-storage-node-common	2013-01-15 18:40:49 +0000
+++ hooks/swift-storage-node-common	2013-04-26 21:13:28 +0000
@@ -2,11 +2,12 @@
 set -ue
 
 CHARM="swift-storage"
+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
 
 DEFAULT_ETH=$(ip route  | grep default | awk '{ print $5 }')

=== modified file 'hooks/swift-storage-node-relations'
--- hooks/swift-storage-node-relations	2013-04-05 20:49:21 +0000
+++ hooks/swift-storage-node-relations	2013-04-26 21:13:28 +0000
@@ -2,13 +2,13 @@
 # test
 set -eu
 
-CHARM_DIR=$(dirname $0)
+HOOKS_DIR="$CHARM_DIR/hooks"
 ARG0=${0##*/}
 
-if [[ -e $CHARM_DIR/swift-storage-node-common ]] ; then
-  . $CHARM_DIR/swift-storage-node-common
+if [[ -e $HOOKS_DIR/swift-storage-node-common ]] ; then
+  . $HOOKS_DIR/swift-storage-node-common
 else
-  echo "ERROR: Could not load swift-storage-node-common from $CHARM_DIR"
+  echo "ERROR: Could not load swift-storage-node-common from $HOOKS_DIR"
 fi
 
 function config_changed {

=== modified file 'revision'
--- revision	2013-04-05 20:49:21 +0000
+++ revision	2013-04-26 21:13:28 +0000
@@ -1,1 +1,1 @@
-57
+58