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: Icfe46c617a21ac97eae54752aad5b0ed53aa706a
Partial-Bug: 1601972
This commit is contained in:
David Ames 2016-07-18 10:13:54 -07:00
parent 30e530a6ba
commit 6b9d50e2bd
3 changed files with 4 additions and 4 deletions

View File

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

View File

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

View File

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