From: Anthony PERARD Date: Wed, 10 May 2017 14:14:44 +0000 (+0100) Subject: ts-openstack-deploy: Switch to Neutron for network X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4720ad6ed9db758bfc19f7e853609499b4489dfd;p=people%2Faperard%2Fosstest.git ts-openstack-deploy: Switch to Neutron for network nova-network is not supported anymore and Neutron is the default. Signed-off-by: Anthony PERARD Acked-by: Ian Jackson --- diff --git a/ts-openstack-deploy b/ts-openstack-deploy index 13490093..21077601 100755 --- a/ts-openstack-deploy +++ b/ts-openstack-deploy @@ -35,6 +35,7 @@ sub checkout () { build_clone($ho, 'openstack_devstack', $builddir, 'devstack'); build_clone($ho, 'openstack_glance', $builddir, 'glance'); build_clone($ho, 'openstack_keystone', $builddir, 'keystone'); + build_clone($ho, 'openstack_neutron', $builddir, 'neutron'); build_clone($ho, 'openstack_nova', $builddir, 'nova'); build_clone($ho, 'openstack_requirements', $builddir, 'requirements'); build_clone($ho, 'openstack_tempest', $builddir, 'tempest'); @@ -63,13 +64,6 @@ LIBVIRT_TYPE=xen disable_service horizon disable_service n-novnc disable_service dstat -# Disable neutron and switch back to nova-network -disable_service q-svc -disable_service q-dhcp -disable_service q-meta -disable_service q-agt -disable_service q-l3 -enable_service n-net USE_SYSTEMD=False # To keep systemd off, we need to enable use of screen USE_SCREEN=True