openstack/charm-keystone
Code Issues Proposed changes

Set source to the appropriate cloud archive pockets.

Browse Source
This commit is contained in:
Corey Bryant 2014-07-01 14:06:01 +00:00
parent 1771f0619e
commit 1820723531
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/11-basic-precise-folsom
View File

@ -6,5 +6,6 @@ from basic_deployment import KeystoneBasicDeployment
if __name__ == '__main__': if __name__ == '__main__':
deployment = KeystoneBasicDeployment(series='precise', deployment = KeystoneBasicDeployment(series='precise',
openstack='cloud:precise-folsom') openstack='cloud:precise-folsom',
source='cloud:precise-updates/folsom')
deployment.run_tests() deployment.run_tests()

3
tests/12-basic-precise-grizzly
View File

@ -6,5 +6,6 @@ from basic_deployment import KeystoneBasicDeployment
if __name__ == '__main__': if __name__ == '__main__':
deployment = KeystoneBasicDeployment(series='precise', deployment = KeystoneBasicDeployment(series='precise',
openstack='cloud:precise-grizzly') openstack='cloud:precise-grizzly',
source='cloud:precise-updates/grizzly')
deployment.run_tests() deployment.run_tests()

3
tests/13-basic-precise-havana
View File

@ -6,5 +6,6 @@ from basic_deployment import KeystoneBasicDeployment
if __name__ == '__main__': if __name__ == '__main__':
deployment = KeystoneBasicDeployment(series='precise', deployment = KeystoneBasicDeployment(series='precise',
openstack='cloud:precise-havana') openstack='cloud:precise-havana',
source='cloud:precise-updates/havana')
deployment.run_tests() deployment.run_tests()

3
tests/14-basic-precise-icehouse
View File

@ -6,5 +6,6 @@ from basic_deployment import KeystoneBasicDeployment
if __name__ == '__main__': if __name__ == '__main__':
deployment = KeystoneBasicDeployment(series='precise', deployment = KeystoneBasicDeployment(series='precise',
openstack='cloud:precise-icehouse') openstack='cloud:precise-icehouse',
source='cloud:precise-updates/icehouse')
deployment.run_tests() deployment.run_tests()

4
tests/basic_deployment.py
View File

@ -19,9 +19,9 @@ u = OpenStackAmuletUtils(ERROR)
class KeystoneBasicDeployment(OpenStackAmuletDeployment): class KeystoneBasicDeployment(OpenStackAmuletDeployment):
"""Amulet tests on a basic keystone deployment.""" """Amulet tests on a basic keystone deployment."""
def __init__(self, series=None, openstack=None): def __init__(self, series=None, openstack=None, source=None):
"""Deploy the entire test environment.""" """Deploy the entire test environment."""
super(KeystoneBasicDeployment, self).__init__(series, openstack) super(KeystoneBasicDeployment, self).__init__(series, openstack, source)
self._add_services() self._add_services()
self._add_relations() self._add_relations()
self._configure_services() self._configure_services()