openstack
/
charm-openstack-dashboard
Code Issues Proposed changes

[corey.bryant,trivial] Pin oslo libraries for juno amulet deploy from source.

This commit is contained in:
Corey Bryant 2015-08-05 12:31:56 +00:00
parent c1685c8f4d 7d3b77dd95
commit e93691bc24
1 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
tests/basic_deployment.py
View File

@ -69,19 +69,48 @@ class OpenstackDashboardBasicDeployment(OpenStackAmuletDeployment):
branch = 'stable/' + self._get_openstack_release_string()
openstack_origin_git = {
'repositories': [
{'name': 'requirements',
'repository': reqs_repo,
'branch': branch},
{'name': 'horizon',
'repository': horizon_repo,
'branch': branch},
],
'directory': '/mnt/openstack-git',
'http_proxy': amulet_http_proxy,
'https_proxy': amulet_http_proxy,
}
if self._get_openstack_release() == self.trusty_juno:
openstack_origin_git = {
'repositories': [
{'name': 'requirements',
'repository': reqs_repo,
'branch': branch},
# NOTE(coreycb): Pin oslo libraries here because they're not
# capped and recently released versions causing issues for juno.
{'name': 'oslo-config',
'repository': 'git://github.com/openstack/oslo.config',
'branch': '1.6.0'},
{'name': 'oslo-i18n',
'repository': 'git://github.com/openstack/oslo.i18n',
'branch': '1.3.1'},
{'name': 'oslo-serialization',
'repository': 'git://github.com/openstack/oslo.serialization',
'branch': '1.2.0'},
{'name': 'oslo-utils',
'repository': 'git://github.com/openstack/oslo.utils',
'branch': '1.4.0'},
{'name': 'horizon',
'repository': horizon_repo,
'branch': branch},
],
'directory': '/mnt/openstack-git',
'http_proxy': amulet_http_proxy,
'https_proxy': amulet_http_proxy,
}
else:
openstack_origin_git = {
'repositories': [
{'name': 'requirements',
'repository': reqs_repo,
'branch': branch},
{'name': 'horizon',
'repository': horizon_repo,
'branch': branch},
],
'directory': '/mnt/openstack-git',
'http_proxy': amulet_http_proxy,
'https_proxy': amulet_http_proxy,
}
horizon_config['openstack-origin-git'] = yaml.dump(openstack_origin_git)
keystone_config = {'admin-password': 'openstack',