More amulet deploy from source branch fixups.

This commit is contained in:
Corey Bryant 2015-07-13 16:07:29 +00:00
parent fa048bfbcd
commit 7ad54c9b48

View File

@ -78,18 +78,16 @@ class CinderBasicDeployment(OpenStackAmuletDeployment):
reqs_repo = 'git://github.com/coreycb/requirements' reqs_repo = 'git://github.com/coreycb/requirements'
cinder_repo = 'git://github.com/coreycb/cinder' cinder_repo = 'git://github.com/coreycb/cinder'
release = self._get_openstack_release_string() branch = 'stable/' + self._get_openstack_release_string()
reqs_branch = 'stable/' + release
cinder_branch = 'stable/' + release
openstack_origin_git = { openstack_origin_git = {
'repositories': [ 'repositories': [
{'name': 'requirements', {'name': 'requirements',
'repository': reqs_repo, 'repository': reqs_repo,
'branch': reqs_branch}, 'branch': branch},
{'name': 'cinder', {'name': 'cinder',
'repository': cinder_repo, 'repository': cinder_repo,
'branch': cinder_branch}, 'branch': branch},
], ],
# Most tests use /mnt/openstack-git but cinder's using /dev/vdb # Most tests use /mnt/openstack-git but cinder's using /dev/vdb
# to store block devices so leave /mnt alone. # to store block devices so leave /mnt alone.