Merge lp:~andreserl/charm-tools/juju_rc_path-helpers into lp:~openstack-charmers/charm-tools/pyrewrite-helpers

[Andres Rodriguez]

make sure juju_rc_path is created. use charm_dir to determine the base path.

[James Page (james-page)]

review: Approve

[James Page (james-page)]

Urgh - sorry - just spotted this:

 + if not os.path.exists(os.path.dirname(juju_rc_path)):
19 + os.mkdir(os.path.dirname(juju_rc_path))

If charm_dir does not exists things are pretty broken - so I'd not bother with the check.

review: Needs Fixing

[Andres Rodriguez (andreserl)]

Hi James!

I believe that the check is still required. This function is used in config_changed, which means is gonna be called in such event. If the check would not be there, the function would always try to create juju_rc_path, but when the directory exists, it will fail. However, with the check, it will only create the directory when it does not exists (and this is not charm_dir, but the script path)

Cheers.

[James Page (james-page)]

Yes - you are correct - +1 with a drop of the unit_name buildout as its no longer required.

review: Approve

[lp:~andreserl/charm-tools/juju_rc_path-helpers]

54. By Andres Rodriguez on 2013-07-16

Remove unit_name buildout as it is no longer required

=== modified file 'charmhelpers/contrib/openstack/openstack_utils.py'
--- charmhelpers/contrib/openstack/openstack_utils.py	2013-07-09 22:18:52 +0000
+++ charmhelpers/contrib/openstack/openstack_utils.py	2013-07-16 14:17:26 +0000
@@ -11,6 +11,7 @@
 
 from charmhelpers.core.hookenv import (
     config,
+    charm_dir,
 )
 
 CLOUD_ARCHIVE_URL = "http://ubuntu-cloud.archive.canonical.com/ubuntu"
@@ -246,8 +247,9 @@
     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)
+    juju_rc_path = "%s/%s" % (charm_dir(), script_path)
+    if not os.path.exists(os.path.dirname(juju_rc_path)):
+        os.mkdir(os.path.dirname(juju_rc_path))
     with open(juju_rc_path, 'wb') as rc_script:
         rc_script.write(
             "#!/bin/bash\n")