openstack
/
charm-odl-controller
Code Issues Proposed changes

Pre 1607 release charm-helpers sync 

Sync charmhelpers to pick up bug fixes for 1607 release

Change-Id: I58dbe8293e3a8c193200149cd097b5426b172adc
This commit is contained in:
Liam Young 2016-07-21 14:24:39 +00:00
parent 8130e9067c
commit 8d2b6e5126
3 changed files with 18 additions and 6 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)

10
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
@ -212,6 +212,7 @@ GIT_DEFAULT_REPOS = {
'glance': 'git://github.com/openstack/glance', 'glance': 'git://github.com/openstack/glance',
'horizon': 'git://github.com/openstack/horizon', 'horizon': 'git://github.com/openstack/horizon',
'keystone': 'git://github.com/openstack/keystone', 'keystone': 'git://github.com/openstack/keystone',
'networking-hyperv': 'git://github.com/openstack/networking-hyperv',
'neutron': 'git://github.com/openstack/neutron', 'neutron': 'git://github.com/openstack/neutron',
'neutron-fwaas': 'git://github.com/openstack/neutron-fwaas', 'neutron-fwaas': 'git://github.com/openstack/neutron-fwaas',
'neutron-lbaas': 'git://github.com/openstack/neutron-lbaas', 'neutron-lbaas': 'git://github.com/openstack/neutron-lbaas',
@ -761,6 +762,13 @@ def git_default_repos(projects_yaml):
if service in ['neutron-api', 'neutron-gateway', if service in ['neutron-api', 'neutron-gateway',
'neutron-openvswitch']: 'neutron-openvswitch']:
core_project = 'neutron' core_project = 'neutron'
if service == 'neutron-api':
repo = {
'name': 'networking-hyperv',
'repository': GIT_DEFAULT_REPOS['networking-hyperv'],
'branch': branch,
}
repos.append(repo)
for project in ['neutron-fwaas', 'neutron-lbaas', for project in ['neutron-fwaas', 'neutron-lbaas',
'neutron-vpnaas', 'nova']: 'neutron-vpnaas', 'nova']:
repo = { repo = {

10
tests/charmhelpers/contrib/amulet/deployment.py
View File

@ -78,11 +78,15 @@ class AmuletDeployment(object):
def _deploy(self): def _deploy(self):
"""Deploy environment and wait for all hooks to finish executing.""" """Deploy environment and wait for all hooks to finish executing."""
timeout = int(os.environ.get('AMULET_SETUP_TIMEOUT', 900))
try: try:
self.d.setup(timeout=900) self.d.setup(timeout=timeout)
self.d.sentry.wait(timeout=900) self.d.sentry.wait(timeout=timeout)
except amulet.helpers.TimeoutError: except amulet.helpers.TimeoutError:
amulet.raise_status(amulet.FAIL, msg="Deployment timed out") amulet.raise_status(
amulet.FAIL,
msg="Deployment timed out ({}s)".format(timeout)
)
except Exception: except Exception:
raise raise