Drop use of old branches, hopefully fixing liberty tests

This commit is contained in:
James Page 2016-02-19 18:08:58 +00:00
parent cf45e5c995
commit a6805592a0
1 changed files with 2 additions and 10 deletions

View File

@ -52,16 +52,8 @@ class ODLControllerBasicDeployment(OpenStackAmuletDeployment):
{'name': 'keystone'},
{'name': 'nova-cloud-controller'},
{'name': 'neutron-gateway'},
{
'name': 'neutron-api-odl',
'location': 'lp:~openstack-charmers/charms/trusty/'
'neutron-api-odl/vpp',
},
{
'name': 'openvswitch-odl',
'location': 'lp:~openstack-charmers/charms/trusty/'
'openvswitch-odl/trunk',
},
{'name': 'neutron-api-odl'},
{'name': 'openvswitch-odl'},
{'name': 'neutron-api'},
{'name': 'nova-compute'},
{'name': 'glance'},