Merge "Remove redundant path change and fix relative path change"
This commit is contained in:
commit
aadc2ce8dd
|
@ -33,8 +33,6 @@ _add_path(_hooks)
|
|||
|
||||
from charmhelpers.core.hookenv import action_fail
|
||||
|
||||
sys.path.append('hooks/')
|
||||
|
||||
from glance_utils import (
|
||||
pause_unit_helper,
|
||||
resume_unit_helper,
|
||||
|
|
|
@ -19,6 +19,7 @@ import sys
|
|||
|
||||
_path = os.path.dirname(os.path.realpath(__file__))
|
||||
_parent = os.path.abspath(os.path.join(_path, ".."))
|
||||
_hooks = os.path.abspath(os.path.join(_parent, "hooks"))
|
||||
|
||||
|
||||
def _add_path(path):
|
||||
|
@ -27,14 +28,13 @@ def _add_path(path):
|
|||
|
||||
|
||||
_add_path(_parent)
|
||||
_add_path(_hooks)
|
||||
|
||||
|
||||
from charmhelpers.contrib.openstack.utils import (
|
||||
do_action_openstack_upgrade,
|
||||
)
|
||||
|
||||
sys.path.append('hooks/')
|
||||
|
||||
from glance_relations import (
|
||||
config_changed,
|
||||
CONFIGS
|
||||
|
|
Loading…
Reference in New Issue