diff --git a/hooks/charmhelpers/contrib/network/ip.py b/hooks/charmhelpers/contrib/network/ip.py index b5f457c7..d6dee17c 100644 --- a/hooks/charmhelpers/contrib/network/ip.py +++ b/hooks/charmhelpers/contrib/network/ip.py @@ -414,7 +414,7 @@ def ns_query(address): try: import dns.resolver except ImportError: - apt_install('python-dnspython') + apt_install('python-dnspython', fatal=True) import dns.resolver if isinstance(address, dns.name.Name): @@ -458,7 +458,7 @@ def get_hostname(address, fqdn=True): try: import dns.reversename except ImportError: - apt_install("python-dnspython") + apt_install("python-dnspython", fatal=True) import dns.reversename rev = dns.reversename.from_address(address) diff --git a/hooks/charmhelpers/contrib/openstack/utils.py b/hooks/charmhelpers/contrib/openstack/utils.py index 519eae95..889ac044 100644 --- a/hooks/charmhelpers/contrib/openstack/utils.py +++ b/hooks/charmhelpers/contrib/openstack/utils.py @@ -145,7 +145,7 @@ SWIFT_CODENAMES = OrderedDict([ ('mitaka', ['2.5.0', '2.6.0', '2.7.0']), ('newton', - ['2.8.0']), + ['2.8.0', '2.9.0']), ]) # >= Liberty version->codename mapping diff --git a/hooks/install b/hooks/install index 83a9d3ce..29ff6894 100755 --- a/hooks/install +++ b/hooks/install @@ -2,7 +2,7 @@ # Wrapper to deal with newer Ubuntu versions that don't have py2 installed # by default. -declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml') +declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml' 'dnspython') check_and_install() { pkg="${1}-${2}"