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

[Andreas Hasenack]

This branch makes the nova-compute charm use CHARM_DIR instead of a hardcoded path for the charm location on disk, thereby being compatible with both juju and juju-core.

=== modified file 'hooks/lib/nova/nova-common'
--- hooks/lib/nova/nova-common	2013-04-04 23:34:30 +0000
+++ hooks/lib/nova/nova-common	2013-04-26 13:16:05 +0000
@@ -3,19 +3,20 @@
 # Common utility functions used across all nova charms.
 
 CONFIG_CHANGED=False
+HOOKS_DIR="$CHARM_DIR/hooks"
 
 # Load the common OpenStack helper library.
-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 "Couldn't load $CHARM_DIR/lib/opentack-common." && exit 1
+  juju-log "Couldn't load $HOOKS_DIR/lib/opentack-common." && exit 1
 fi
 
 set_or_update() {
   # Update config flags in nova.conf or api-paste.ini.
   # Config layout changed in Folsom, so this is now OpenStack release specific.
   local rel=$(get_os_codename_package "nova-common")
-  . $CHARM_DIR/lib/nova/$rel
+  . $HOOKS_DIR/lib/nova/$rel
   nova_set_or_update $@
 }
 
@@ -130,7 +131,7 @@
 
   # load the release helper library for pre/post upgrade hooks specific to the
   # release we are upgrading to.
-  . $CHARM_DIR/lib/nova/$new_rel
+  . $HOOKS_DIR/lib/nova/$new_rel
 
   # new release specific pre-upgrade hook
   nova_pre_upgrade "$orig_os_rel"

=== modified file 'hooks/lib/openstack-common'
--- hooks/lib/openstack-common	2013-04-04 23:34:30 +0000
+++ hooks/lib/openstack-common	2013-04-26 13:16:05 +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 'hooks/nova-compute-common'
--- hooks/nova-compute-common	2013-04-05 18:43:45 +0000
+++ hooks/nova-compute-common	2013-04-26 13:16:05 +0000
@@ -8,6 +8,7 @@
 API_CONF="/etc/nova/api-paste.ini"
 QUANTUM_CONF="/etc/quantum/quantum.conf"
 LIBVIRTD_CONF="/etc/libvirt/libvirtd.conf"
+HOOKS_DIR="$CHARM_DIR/hooks"
 
 if [ -f /etc/nova/nm.conf ]; then
     NET_MANAGER=$(cat /etc/nova/nm.conf)
@@ -33,10 +34,10 @@
     ;;
 esac
 
-if [[ -e $CHARM_DIR/lib/nova/nova-common ]] ; then
-  . $CHARM_DIR/lib/nova/nova-common
+if [[ -e $HOOKS_DIR/lib/nova/nova-common ]] ; then
+  . $HOOKS_DIR/lib/nova/nova-common
 else
-  juju-log "$CHARM: Couldn't load $CHARM_DIR/lib/nova-common" && exit 1
+  juju-log "$CHARM: Couldn't load $HOOKS_DIR/lib/nova-common" && exit 1
 fi
 
 determine_compute_package() {

=== modified file 'hooks/nova-compute-relations'
--- hooks/nova-compute-relations	2013-04-11 03:18:41 +0000
+++ hooks/nova-compute-relations	2013-04-26 13:16:05 +0000
@@ -1,11 +1,11 @@
 #!/bin/bash -e
-CHARM_DIR=$(dirname $0)
+HOOKS_DIR="$CHARM_DIR/hooks"
 ARG0=${0##*/}
 
-if [[ -e $CHARM_DIR/nova-compute-common ]] ; then
-  . $CHARM_DIR/nova-compute-common
+if [[ -e $HOOKS_DIR/nova-compute-common ]] ; then
+  . $HOOKS_DIR/nova-compute-common
 else
-  juju-log "ERROR: Could not load nova-compute-common from $CHARM_DIR"
+  juju-log "ERROR: Could not load nova-compute-common from $HOOKS_DIR"
 fi
 
 function install_hook {

=== modified file 'revision'
--- revision	2013-04-11 03:18:41 +0000
+++ revision	2013-04-26 13:16:05 +0000
@@ -1,1 +1,1 @@
-90
+91