openstack/charm-ceph-radosgw
Code Issues Proposed changes

Install python dependencies early for CH ip.py

Browse Source 
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
This commit is contained in:
David Ames 2016-07-18 10:06:20 -07:00
parent b75bb8b08b
commit 2e1402a3ad
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/charmhelpers/contrib/network/ip.py
View File

@ -414,7 +414,7 @@ def ns_query(address):
try: try:
import dns.resolver import dns.resolver
except ImportError: except ImportError:
apt_install('python-dnspython') apt_install('python-dnspython', fatal=True)
import dns.resolver import dns.resolver
if isinstance(address, dns.name.Name): if isinstance(address, dns.name.Name):
@ -458,7 +458,7 @@ def get_hostname(address, fqdn=True):
try: try:
import dns.reversename import dns.reversename
except ImportError: except ImportError:
apt_install("python-dnspython") apt_install("python-dnspython", fatal=True)
import dns.reversename import dns.reversename
rev = dns.reversename.from_address(address) rev = dns.reversename.from_address(address)

2
hooks/charmhelpers/contrib/openstack/utils.py
View File

@ -145,7 +145,7 @@ SWIFT_CODENAMES = OrderedDict([
('mitaka', ('mitaka',
['2.5.0', '2.6.0', '2.7.0']), ['2.5.0', '2.6.0', '2.7.0']),
('newton', ('newton',
['2.8.0']), ['2.8.0', '2.9.0']),
]) ])
# >= Liberty version->codename mapping # >= Liberty version->codename mapping