diff --git a/actions/create-cache-tier b/actions/create-cache-tier index 51a6518..97a1d1e 100755 --- a/actions/create-cache-tier +++ b/actions/create-cache-tier @@ -1,9 +1,21 @@ -#!/usr/bin/python +#!/usr/bin/env python3 __author__ = 'chris' +import os from subprocess import CalledProcessError import sys -sys.path.append('hooks') +_path = os.path.dirname(os.path.realpath(__file__)) +_hooks = os.path.abspath(os.path.join(_path, '../hooks')) +_root = os.path.abspath(os.path.join(_path, '..')) + + +def _add_path(path): + if path not in sys.path: + sys.path.insert(1, path) + +_add_path(_hooks) +_add_path(_root) + from charmhelpers.contrib.storage.linux.ceph import Pool, pool_exists from charmhelpers.core.hookenv import action_get, config, log, action_fail @@ -14,6 +26,7 @@ def make_cache_tier(): cache_pool = action_get("cache-pool") cache_mode = action_get("cache-mode") user = config('admin-user') + # Pre flight checks if not pool_exists(user, backer_pool): log("Please create {} pool before calling create-cache-tier".format( diff --git a/actions/create-cache-tier.py b/actions/create-cache-tier.py deleted file mode 100755 index 97a1d1e..0000000 --- a/actions/create-cache-tier.py +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env python3 -__author__ = 'chris' -import os -from subprocess import CalledProcessError -import sys - -_path = os.path.dirname(os.path.realpath(__file__)) -_hooks = os.path.abspath(os.path.join(_path, '../hooks')) -_root = os.path.abspath(os.path.join(_path, '..')) - - -def _add_path(path): - if path not in sys.path: - sys.path.insert(1, path) - -_add_path(_hooks) -_add_path(_root) - - -from charmhelpers.contrib.storage.linux.ceph import Pool, pool_exists -from charmhelpers.core.hookenv import action_get, config, log, action_fail - - -def make_cache_tier(): - backer_pool = action_get("backer-pool") - cache_pool = action_get("cache-pool") - cache_mode = action_get("cache-mode") - user = config('admin-user') - - # Pre flight checks - if not pool_exists(user, backer_pool): - log("Please create {} pool before calling create-cache-tier".format( - backer_pool)) - action_fail("create-cache-tier failed. Backer pool {} must exist " - "before calling this".format(backer_pool)) - - if not pool_exists(user, cache_pool): - log("Please create {} pool before calling create-cache-tier".format( - cache_pool)) - action_fail("create-cache-tier failed. Cache pool {} must exist " - "before calling this".format(cache_pool)) - - pool = Pool(service=user, name=backer_pool) - try: - pool.add_cache_tier(cache_pool=cache_pool, mode=cache_mode) - except CalledProcessError as err: - log("Add cache tier failed with message: {}".format( - err.message)) - action_fail("create-cache-tier failed. Add cache tier failed with " - "message: {}".format(err.message)) - - -if __name__ == '__main__': - make_cache_tier() diff --git a/actions/remove-cache-tier b/actions/remove-cache-tier index 215704d..a6f8f2b 100755 --- a/actions/remove-cache-tier +++ b/actions/remove-cache-tier @@ -1,8 +1,19 @@ -#!/usr/bin/python +#!/usr/bin/env python3 +import os from subprocess import CalledProcessError import sys -sys.path.append('hooks') +_path = os.path.dirname(os.path.realpath(__file__)) +_hooks = os.path.abspath(os.path.join(_path, '../hooks')) +_root = os.path.abspath(os.path.join(_path, '..')) + + +def _add_path(path): + if path not in sys.path: + sys.path.insert(1, path) + +_add_path(_hooks) +_add_path(_root) from charmhelpers.contrib.storage.linux.ceph import Pool, pool_exists from charmhelpers.core.hookenv import action_get, config, log, action_fail @@ -14,7 +25,6 @@ def delete_cache_tier(): backer_pool = action_get("backer-pool") cache_pool = action_get("cache-pool") user = config('admin-user') - # Pre flight checks if not pool_exists(user, backer_pool): log("Backer pool {} must exist before calling this".format( @@ -33,9 +43,9 @@ def delete_cache_tier(): pool.remove_cache_tier(cache_pool=cache_pool) except CalledProcessError as err: log("Removing the cache tier failed with message: {}".format( - err.message)) + str(err))) action_fail("remove-cache-tier failed. Removing the cache tier failed " - "with message: {}".format(err.message)) + "with message: {}".format(str(err))) if __name__ == '__main__': diff --git a/actions/remove-cache-tier.py b/actions/remove-cache-tier.py deleted file mode 100755 index a6f8f2b..0000000 --- a/actions/remove-cache-tier.py +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env python3 -import os -from subprocess import CalledProcessError -import sys - -_path = os.path.dirname(os.path.realpath(__file__)) -_hooks = os.path.abspath(os.path.join(_path, '../hooks')) -_root = os.path.abspath(os.path.join(_path, '..')) - - -def _add_path(path): - if path not in sys.path: - sys.path.insert(1, path) - -_add_path(_hooks) -_add_path(_root) - -from charmhelpers.contrib.storage.linux.ceph import Pool, pool_exists -from charmhelpers.core.hookenv import action_get, config, log, action_fail - -__author__ = 'chris' - - -def delete_cache_tier(): - backer_pool = action_get("backer-pool") - cache_pool = action_get("cache-pool") - user = config('admin-user') - # Pre flight checks - if not pool_exists(user, backer_pool): - log("Backer pool {} must exist before calling this".format( - backer_pool)) - action_fail("remove-cache-tier failed. Backer pool {} must exist " - "before calling this".format(backer_pool)) - - if not pool_exists(user, cache_pool): - log("Cache pool {} must exist before calling this".format( - cache_pool)) - action_fail("remove-cache-tier failed. Cache pool {} must exist " - "before calling this".format(cache_pool)) - - pool = Pool(service=user, name=backer_pool) - try: - pool.remove_cache_tier(cache_pool=cache_pool) - except CalledProcessError as err: - log("Removing the cache tier failed with message: {}".format( - str(err))) - action_fail("remove-cache-tier failed. Removing the cache tier failed " - "with message: {}".format(str(err))) - - -if __name__ == '__main__': - delete_cache_tier()