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

[Andreas Hasenack]

Use CHARM_DIR instead of a hardcoded path for the charm directory. This makes the charm compatible with both juju and juju-core.

Use CHARM_DIR instead of a hardcoded path for the charm directory. This makes the charm compatible with both juju and juju-core.

=== modified file 'hooks/lib/openstack_common.py'
--- hooks/lib/openstack_common.py	2013-03-21 18:25:39 +0000
+++ hooks/lib/openstack_common.py	2013-04-25 17:00:39 +0000
@@ -221,8 +221,8 @@
     updated config information necessary to perform health checks or
     service changes.
     """
-    unit_name = os.getenv('JUJU_UNIT_NAME').replace('/', '-')
-    juju_rc_path = "/var/lib/juju/units/%s/charm/%s" % (unit_name, script_path)
+    charm_dir = os.getenv('CHARM_DIR')
+    juju_rc_path = "%s/%s" % (charm_dir, script_path)
     with open(juju_rc_path, 'wb') as rc_script:
         rc_script.write(
             "#!/bin/bash\n")

=== modified file 'revision'
--- revision	2013-04-09 18:07:32 +0000
+++ revision	2013-04-25 17:00:39 +0000
@@ -1,1 +1,1 @@
-218
+219