From 2e1402a3add458f60f94feb0c0b6c3cca58414bf Mon Sep 17 00:00:00 2001 From: David Ames Date: Mon, 18 Jul 2016 10:06:20 -0700 Subject: [PATCH] Install python dependencies early for CH ip.py When using charmhelpers.contrib.network.ip apt install was quietly failing. Install python dependencies in the early install hook (before install.real). Charm-helpers sync to bring in apt_install with fatal=True Change-Id: Iced4e7be79c5d99a9f47a12085db51012218bdca Partial-Bug: 1601972 --- hooks/charmhelpers/contrib/network/ip.py | 4 ++-- hooks/charmhelpers/contrib/openstack/utils.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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