ts-openstack-deploy: Switch to Neutron for network

nova-network is not supported anymore and Neutron is the default.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/ts-openstack-deploy b/ts-openstack-deploy
index 134900932029ec566223c38e0a5cec5203fc5e99..21077601a7edc7c70ee014f043ff6fc618dd4408 100755 (executable)
--- 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