openstack/charm-keystone
Code Issues Proposed changes

Merge ahasenack's juju-core compat. patches.

Browse Source
This commit is contained in:
Adam Gandelman
2013-04-26 14:44:32 -07:00
parent 0005ae3124 ea38b9eb45
commit bbd0014848
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/lib/openstack_common.py
View File

@@ -221,8 +221,8 @@ def save_script_rc(script_path="scripts/scriptrc", **env_vars):
updated config information necessary to perform health checks or updated config information necessary to perform health checks or
service changes. service changes.
""" """
unit_name = os.getenv('JUJU_UNIT_NAME').replace('/', '-') charm_dir = os.getenv('CHARM_DIR')
juju_rc_path = "/var/lib/juju/units/%s/charm/%s" % (unit_name, script_path) juju_rc_path = "%s/%s" % (charm_dir, script_path)
with open(juju_rc_path, 'wb') as rc_script: with open(juju_rc_path, 'wb') as rc_script:
rc_script.write( rc_script.write(
"#!/bin/bash\n") "#!/bin/bash\n")

2
revision
View File

@@ -1 +1 @@
218 219