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

[Andreas Hasenack]

This change makes the nova-cloud-controller (HA) charm support both juju (python) and juju-core (go) by using the CHARM_DIR variable instead of a hardcoded value for the filesystem path where the charm is copied to.

This change makes the nova-cloud-controller (HA) charm support both juju (python) and juju-core (go) by using the CHARM_DIR variable instead of a hardcoded value for the filesystem path where the charm is copied to.

There were some additional changes because the charm was already using CHARM_DIR for its own purposes, not realizing it's a variable already defined by juju.

[lp:~ahasenack/charms/precise/nova-cloud-controller/use-charm-dir]

75. By Andreas Hasenack on 2013-04-25

One more CHARM_DIR

=== modified file 'hooks/lib/nova/nova-common'
--- hooks/lib/nova/nova-common	2013-04-04 23:34:22 +0000
+++ hooks/lib/nova/nova-common	2013-04-25 19:48:29 +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:22 +0000
+++ hooks/lib/openstack-common	2013-04-25 19:48:29 +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-cloud-controller-common'
--- hooks/nova-cloud-controller-common	2013-03-12 17:34:00 +0000
+++ hooks/nova-cloud-controller-common	2013-04-25 19:48:29 +0000
@@ -7,13 +7,13 @@
 API_CONF="/etc/nova/api-paste.ini"
 QUANTUM_CONF="/etc/quantum/quantum.conf"
 QUANTUM_API_CONF="/etc/quantum/api-paste.ini"
-
+HOOKS_DIR="$CHARM_DIR/hooks"
 NET_MANAGER=$(config-get network-manager)
 
-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 "Couldn't load $CHARM_DIR/lib/nova/nova-common" && exit 1
+  juju-log "Couldn't load $HOOKS_DIR/lib/nova/nova-common" && exit 1
 fi
 
 function determine_services {

=== modified file 'hooks/nova-cloud-controller-relations'
--- hooks/nova-cloud-controller-relations	2013-04-11 18:11:36 +0000
+++ hooks/nova-cloud-controller-relations	2013-04-25 19:48:29 +0000
@@ -1,12 +1,12 @@
 #!/bin/bash -e
 
-CHARM_DIR=$(dirname $0)
+HOOKS_DIR="$CHARM_DIR/hooks"
 arg0=$(basename $0)
 
-if [[ -e $CHARM_DIR/nova-cloud-controller-common ]] ; then
-  . $CHARM_DIR/nova-cloud-controller-common
+if [[ -e $HOOKS_DIR/nova-cloud-controller-common ]] ; then
+  . $HOOKS_DIR/nova-cloud-controller-common
 else
-  juju-log "ERROR: Could not load nova-cloud-controller-common from $CHARM_DIR"
+  juju-log "ERROR: Could not load nova-cloud-controller-common from $HOOKS_DIR"
 fi
 
 function install_hook {

=== modified file 'revision'
--- revision	2013-04-04 23:34:22 +0000
+++ revision	2013-04-25 19:48:29 +0000
@@ -1,1 +1,1 @@
-261
+262