Update tests for release branch version

This commit is contained in:
James Page 2015-11-03 09:08:59 +00:00
parent 00cc5dd5b6
commit c71bcf6fce
1 changed files with 2 additions and 8 deletions

View File

@ -44,19 +44,13 @@ class OVSODLBasicDeployment(OpenStackAmuletDeployment):
other_services = [
{
'name': 'nova-compute',
'location': 'lp:~openstack-charmers/charms/trusty/'
'nova-compute/next',
'constraints': {'mem': '4G'},
},
{
'name': 'neutron-api',
'location': 'lp:~james-page/charms/trusty/neutron-api/'
'subordinate-plugins',
},
{
'name': 'neutron-gateway',
'location': 'lp:~sdn-charmers/charms/trusty/neutron-gateway/'
'ovs-odl',
},
{
'name': 'odl-controller',
@ -66,8 +60,8 @@ class OVSODLBasicDeployment(OpenStackAmuletDeployment):
},
{
'name': 'neutron-api-odl',
'location': 'lp:~james-page/charms/trusty/neutron-api-odl/'
'kilo-support',
'location': 'lp:~openstack-charmres/charms/trusty'
'/neutron-api-odl/trunk',
},
{'name': 'mysql'},
{'name': 'rabbitmq-server'},