openstack/charm-cinder
Code Issues Proposed changes

[corey.bryant,trivial] Amulet deploy from source updates

Browse Source 
Use icehouse repositories with modified requirements due to issues
with final upstream icehouse requirements.

Use /tmp/openstack-git instead of /mnt/openstack-git to prevent
conflict with /dev/vdb.
This commit is contained in:
Corey Bryant 2015-07-13 14:24:16 -04:00
commit dc4a9052f9
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/basic_deployment.py
View File

@ -70,23 +70,28 @@ class CinderBasicDeployment(OpenStackAmuletDeployment):
'glance-api-version': '2', 'glance-api-version': '2',
'overwrite': 'true'} 'overwrite': 'true'}
if self.git: if self.git:
release = self._get_openstack_release_string()
reqs_branch = 'stable/' + release
if self._get_openstack_release() == self.trusty_icehouse:
cinder_branch = release + '-eol'
else:
cinder_branch = 'stable/' + release
amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY') amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
reqs_repo = 'git://github.com/openstack/requirements'
cinder_repo = 'git://github.com/openstack/cinder'
if self._get_openstack_release() == self.trusty_icehouse:
reqs_repo = 'git://github.com/coreycb/requirements'
cinder_repo = 'git://github.com/coreycb/cinder'
branch = 'stable/' + self._get_openstack_release_string()
openstack_origin_git = { openstack_origin_git = {
'repositories': [ 'repositories': [
{'name': 'requirements', {'name': 'requirements',
'repository': 'git://github.com/openstack/requirements', 'repository': reqs_repo,
'branch': reqs_branch}, 'branch': branch},
{'name': 'cinder', {'name': 'cinder',
'repository': 'git://github.com/openstack/cinder', 'repository': cinder_repo,
'branch': cinder_branch}, 'branch': branch},
], ],
'directory': '/mnt/openstack-git', # Most tests use /mnt/openstack-git but cinder's using /dev/vdb
# to store block devices so leave /mnt alone.
'directory': '/tmp/openstack-git',
'http_proxy': amulet_http_proxy, 'http_proxy': amulet_http_proxy,
'https_proxy': amulet_http_proxy, 'https_proxy': amulet_http_proxy,
} }