Move charmhelpers to separate dir.
This commit is contained in:
parent
5ca88c090e
commit
9850443aa6
|
@ -4,3 +4,4 @@ exclude_lines =
|
||||||
if __name__ == .__main__.:
|
if __name__ == .__main__.:
|
||||||
include=
|
include=
|
||||||
hooks/glance_*
|
hooks/glance_*
|
||||||
|
actions/actions.py
|
||||||
|
|
|
@ -2,3 +2,7 @@ git-reinstall:
|
||||||
description: Reinstall glance from the openstack-origin-git repositories.
|
description: Reinstall glance from the openstack-origin-git repositories.
|
||||||
openstack-upgrade:
|
openstack-upgrade:
|
||||||
description: Perform openstack upgrades. Config option action-managed-upgrade must be set to True.
|
description: Perform openstack upgrades. Config option action-managed-upgrade must be set to True.
|
||||||
|
pause:
|
||||||
|
description: Pause glance service.
|
||||||
|
resume:
|
||||||
|
description: Resume glance service.
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
../charmhelpers
|
|
@ -1,8 +1,6 @@
|
||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
import sys
|
|
||||||
import traceback
|
|
||||||
|
|
||||||
sys.path.append('hooks/')
|
import traceback
|
||||||
|
|
||||||
from charmhelpers.contrib.openstack.utils import (
|
from charmhelpers.contrib.openstack.utils import (
|
||||||
git_install_requested,
|
git_install_requested,
|
||||||
|
@ -14,11 +12,11 @@ from charmhelpers.core.hookenv import (
|
||||||
config,
|
config,
|
||||||
)
|
)
|
||||||
|
|
||||||
from glance_utils import (
|
from hooks.glance_utils import (
|
||||||
git_install,
|
git_install,
|
||||||
)
|
)
|
||||||
|
|
||||||
from glance_relations import (
|
from hooks.glance_relations import (
|
||||||
config_changed,
|
config_changed,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
../hooks
|
|
@ -1,8 +1,7 @@
|
||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
import sys
|
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
sys.path.append('hooks/')
|
|
||||||
|
|
||||||
from charmhelpers.core.hookenv import (
|
from charmhelpers.core.hookenv import (
|
||||||
action_set,
|
action_set,
|
||||||
|
@ -10,7 +9,7 @@ from charmhelpers.core.hookenv import (
|
||||||
config
|
config
|
||||||
)
|
)
|
||||||
|
|
||||||
from glance_relations import config_changed
|
from hooks.glance_relations import config_changed
|
||||||
|
|
||||||
from charmhelpers.contrib.openstack.utils import (
|
from charmhelpers.contrib.openstack.utils import (
|
||||||
juju_log,
|
juju_log,
|
||||||
|
@ -18,7 +17,7 @@ from charmhelpers.contrib.openstack.utils import (
|
||||||
openstack_upgrade_available
|
openstack_upgrade_available
|
||||||
)
|
)
|
||||||
|
|
||||||
from glance_utils import (
|
from hooks.glance_utils import (
|
||||||
do_openstack_upgrade,
|
do_openstack_upgrade,
|
||||||
register_configs
|
register_configs
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
branch: lp:charm-helpers
|
branch: lp:charm-helpers
|
||||||
destination: hooks/charmhelpers
|
destination: charmhelpers
|
||||||
include:
|
include:
|
||||||
- core
|
- core
|
||||||
- cli
|
- cli
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
../charmhelpers
|
Loading…
Reference in New Issue