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

[Andreas Hasenack]

This branch makes it possible to deploy glance using both juju-core and juju by using the CHARM_DIR environment variable instead of relying on a hardcoded path. This path changed between juju and juju-core, hence the bug.

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

50. By Andreas Hasenack on 2013-04-26

Merged with upstream

51. By Andreas Hasenack on 2013-04-26

typo

52. By Andreas Hasenack on 2013-04-26

revision

=== modified file 'hooks/glance-common'
--- hooks/glance-common	2013-04-04 23:34:08 +0000
+++ hooks/glance-common	2013-04-26 21:12:28 +0000
@@ -10,13 +10,14 @@
 GLANCE_API_CONF="/etc/glance/glance-api.conf"
 GLANCE_API_PASTE_INI="/etc/glance/glance-api-paste.ini"
 CONF_DIR="/etc/glance"
+HOOKS_DIR="$CHARM_DIR/hooks"
 
 # Flag used to track config changes.
 CONFIG_CHANGED="False"
-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
 
 function set_paste_deploy_flavor {

=== modified file 'hooks/glance-relations'
--- hooks/glance-relations	2013-04-04 23:34:08 +0000
+++ hooks/glance-relations	2013-04-26 21:12:28 +0000
@@ -1,12 +1,12 @@
 #!/bin/bash -e
 
-CHARM_DIR=$(dirname $0)
+HOOKS_DIR="$CHARM_DIR/hooks"
 ARG0=${0##*/}
 
-if [[ -e $CHARM_DIR/glance-common ]] ; then
-  . $CHARM_DIR/glance-common
+if [[ -e $HOOKS_DIR/glance-common ]] ; then
+  . $HOOKS_DIR/glance-common
 else
-  echo "ERROR: Could nto load glance-common from $CHARM_DIR"
+  echo "ERROR: Could not load glance-common from $HOOKS_DIR"
 fi
 
 function install_hook {

=== modified file 'hooks/lib/openstack-common'
--- hooks/lib/openstack-common	2013-04-04 23:34:08 +0000
+++ hooks/lib/openstack-common	2013-04-26 21:12:28 +0000
@@ -762,7 +762,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"
 
@@ -771,7 +771,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-04-04 23:34:08 +0000
+++ revision	2013-04-26 21:12:28 +0000
@@ -1,1 +1,1 @@
-140
+141