diff options
| -rwxr-xr-x | hooks/hooks.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/hooks/hooks.py b/hooks/hooks.py index 83b19af..5ac0818 100755 --- a/hooks/hooks.py +++ b/hooks/hooks.py @@ -6,14 +6,15 @@ Created on Aug 1, 2012 ''' import commands +import json import os +import pprint import re import signal import socket import subprocess import sys import time -import pprint try: import yaml # flake8: noqa @@ -31,14 +32,15 @@ from string import Template from textwrap import dedent from yaml.constructor import ConstructorError +from charmhelpers.core.decorators import retry_on_exception +from charmhelpers.payload.execd import execd_preinstall + from charmhelpers.fetch import ( add_source, apt_update, apt_install ) -import json - from charmhelpers.core.host import ( service, lsb_release, @@ -48,6 +50,7 @@ from charmhelpers.core.hookenv import ( close_port, config, is_relation_made, + log as juju_log, open_port, unit_get, relation_get, @@ -64,10 +67,6 @@ from charmhelpers.core.hookenv import ( application_version_set, ) -from charmhelpers.core.hookenv import log as juju_log - -from charmhelpers.payload.execd import execd_preinstall - from charmhelpers.contrib.hahelpers.cluster import ( peer_units ) |
