From patchwork Fri Jun 16 17:56:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9792873 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0975560326 for ; Fri, 16 Jun 2017 18:18:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0332D285DA for ; Fri, 16 Jun 2017 18:18:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA6C62866E; Fri, 16 Jun 2017 18:18:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 969C3285DA for ; Fri, 16 Jun 2017 18:18:03 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dLvnQ-0004u0-UC; Fri, 16 Jun 2017 18:16:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dLvnQ-0004sP-Cz for xen-devel@lists.xenproject.org; Fri, 16 Jun 2017 18:16:36 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 87/AA-02180-38024495; Fri, 16 Jun 2017 18:16:35 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeJIrShJLcpLzFFi42JxWrohUrdBwSX S4GUPj8X3LZOZHBg9Dn+4whLAGMWamZeUX5HAmnHt5Dn2gsmCFQc/HmRsYJzL18XIySEh4C/x 78sddhCbTcBAYsX0q4xdjBwcIgIqErf3GoCEmQUiJF7cWMUGYgsLhEp0Ny5gArFZBFQlmo48Y QaxeQXsJPYunscKMVJeYtq7XlaQMZxA8d9bi0HCQgK2En9XNLJB2GoSNxYuY4FoFZQ4OfMJC8 QqCYmDL14wT2DknYUkNQtJagEj0ypGjeLUorLUIl0jU72kosz0jJLcxMwcXUMDU73c1OLixPT UnMSkYr3k/NxNjMDAqWdgYNzBuKvd7xCjJAeTkijv+yfOkUJ8SfkplRmJxRnxRaU5qcWHGGU4 OJQkeKvlXSKFBItS01Mr0jJzgCEMk5bg4FES4d3PB5TmLS5IzC3OTIdInWLU5diwev0XJiGWv Py8VClxXguQGQIgRRmleXAjYPF0iVFWSpiXkYGBQYinILUoN7MEVf4VozgHo5Iw71M5oCk8mX klcJteAR3BBHRE0AUHkCNKEhFSUg2MyYUOnDO/2KeLJv1UfyQ22eLoC6ZMne2TruQ5szW4r1m kW86W99tt2pEDMj5sE/+4/I30zlz03pzpgPeHNnW/Uxx1cjOen81Z4G6vfiehlO+A7EHFoyek 7WetebVr2v6EWsHTna+tebw2y7JqzDswceE9TbbOM3rGMofKJjiVGmgorvbWeiWkxFKckWiox VxUnAgAiNaIXqICAAA= X-Env-Sender: prvs=333b30148=anthony.perard@citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1497636979!67524616!6 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 53422 invoked from network); 16 Jun 2017 18:16:31 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 16 Jun 2017 18:16:31 -0000 X-IronPort-AV: E=Sophos;i="5.39,348,1493683200"; d="scan'208";a="428236161" From: Anthony PERARD To: Date: Fri, 16 Jun 2017 18:56:54 +0100 Message-ID: <20170616175704.7832-11-anthony.perard@citrix.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170616175704.7832-1-anthony.perard@citrix.com> References: <20170616175704.7832-1-anthony.perard@citrix.com> MIME-Version: 1.0 Cc: Anthony PERARD , Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH v11 10/20] ts-openstack-deploy: Switch to Neutron for network X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP nova-network is not supported anymore and Neutron is the default. Signed-off-by: Anthony PERARD Acked-by: Ian Jackson --- ap-common | 3 ++- make-flight | 2 +- ts-openstack-deploy | 8 +------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ap-common b/ap-common index 7e84f15..adfdc11 100644 --- a/ap-common +++ b/ap-common @@ -55,7 +55,8 @@ : ${BASE_TREE_OVMF:=git://xenbits.xen.org/osstest/ovmf.git} define_openstack_trees() { - local openstack_trees=(cinder glance keystone nova requirements tempest) + local openstack_trees=(cinder glance keystone neutron nova requirements + tempest) local tree local url diff --git a/make-flight b/make-flight index 3235cca..ff4f17e 100755 --- a/make-flight +++ b/make-flight @@ -696,7 +696,7 @@ do_examine_one () { do_openstack_tests () { local xsms=$(xenbranch_xsm_variants) - local openstack_trees=(cinder devstack glance keystone nova + local openstack_trees=(cinder devstack glance keystone neutron nova requirements tempest) if [ $branch != openstack-nova ]; then diff --git a/ts-openstack-deploy b/ts-openstack-deploy index 1349009..2107760 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