diff --git a/actions/security_checklist.py b/actions/security_checklist.py index f8b4dad4..41f6cb3b 100755 --- a/actions/security_checklist.py +++ b/actions/security_checklist.py @@ -15,9 +15,20 @@ # limitations under the License. import configparser +import os import sys -sys.path.append('hooks') +_path = os.path.dirname(os.path.realpath(__file__)) +_hooks = os.path.abspath(os.path.join(_path, '../hooks')) + + +def _add_path(path): + if path not in sys.path: + sys.path.insert(1, path) + + +_add_path(_hooks) + import charmhelpers.contrib.openstack.audits as audits from charmhelpers.contrib.openstack.audits import ( @@ -47,5 +58,6 @@ def main(): config['neutron_config'] = dict(conf) return audits.action_parse_results(audits.run(config)) + if __name__ == "__main__": sys.exit(main()) diff --git a/unit_tests/__init__.py b/unit_tests/__init__.py index c9c8fd1a..973e4e6d 100644 --- a/unit_tests/__init__.py +++ b/unit_tests/__init__.py @@ -1,5 +1,18 @@ +import os import sys -sys.path.append('unit_tests') -sys.path.append('actions') -sys.path.append('hooks') + +_path = os.path.dirname(os.path.realpath(__file__)) +_hooks = os.path.abspath(os.path.join(_path, '../hooks')) +_actions = os.path.abspath(os.path.join(_path, '../actions')) +_unit_tests = os.path.abspath(os.path.join(_path, '../unit_tests')) + + +def _add_path(path): + if path not in sys.path: + sys.path.insert(1, path) + + +_add_path(_hooks) +_add_path(_actions) +_add_path(_unit_tests)