openstack
/
charm-glance
Code Issues Proposed changes

Merge "Remove redundant path change and fix relative path change"

This commit is contained in:
Zuul 2018-11-09 15:44:54 +00:00 committed by Gerrit Code Review
parent b8699eccb1 0353df7e28
commit aadc2ce8dd
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/actions.py
View File

@ -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,

4
actions/openstack_upgrade.py
View File

@ -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