From patchwork Fri May 20 18:49:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 624597 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3rBH7h6L3zz9sBc for ; Sat, 21 May 2016 04:50:40 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 729A910CEA; Fri, 20 May 2016 11:50:22 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 1CEAB10CDA for ; Fri, 20 May 2016 11:50:20 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id A98DE161587 for ; Fri, 20 May 2016 12:50:19 -0600 (MDT) X-ASG-Debug-ID: 1463770219-0b323743ee0abf0001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar6.cudamail.com with ESMTP id rAPpkTwwEWvbuyW5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 20 May 2016 12:50:19 -0600 (MDT) X-Barracuda-Envelope-From: joe@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO relay2-d.mail.gandi.net) (217.70.183.194) by mx1-pf1.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 20 May 2016 18:50:18 -0000 Received-SPF: pass (mx1-pf1.cudamail.com: SPF record at ovn.org designates 217.70.183.194 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.194 X-Barracuda-RBL-IP: 217.70.183.194 Received: from mfilter19-d.gandi.net (mfilter19-d.gandi.net [217.70.178.147]) by relay2-d.mail.gandi.net (Postfix) with ESMTP id 58CADC5A49; Fri, 20 May 2016 20:50:17 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter19-d.gandi.net Received: from relay2-d.mail.gandi.net ([IPv6:::ffff:217.70.183.194]) by mfilter19-d.gandi.net (mfilter19-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id p4RsKQZwiTEa; Fri, 20 May 2016 20:50:15 +0200 (CEST) X-Originating-IP: 208.91.2.4 Received: from archer.localdomain (unknown [208.91.2.4]) (Authenticated sender: joe@ovn.org) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 16AEDC5A72; Fri, 20 May 2016 20:50:14 +0200 (CEST) X-CudaMail-Envelope-Sender: joe@ovn.org From: Joe Stringer To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E1-519053908 X-CudaMail-DTE: 052016 X-CudaMail-Originating-IP: 217.70.183.194 Date: Fri, 20 May 2016 11:49:57 -0700 X-ASG-Orig-Subj: [##CM-E1-519053908##][PATCH 4/6] vagrant: Override box for libvirt provider. Message-Id: <1463770199-24391-5-git-send-email-joe@ovn.org> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1463770199-24391-1-git-send-email-joe@ovn.org> References: <1463770199-24391-1-git-send-email-joe@ovn.org> X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1463770219 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH 4/6] vagrant: Override box for libvirt provider. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" The default vagrant box for fedora23 uses the images provided by Chef's "bento" project, which has support for 3 backend providers: parallels, virtualbox and vmware. However, they do not build boxes for the libvirt backend. Introduce an override for the box to use the official fedora project box if trying to use the libvirt provider. Signed-off-by: Joe Stringer --- Vagrantfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index 4f2e0fdb7c48..dab03de56fac 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -56,6 +56,9 @@ SCRIPT Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.define "fedora-23" do |fedora| fedora.vm.box = "bento/fedora-23" + fedora.vm.provider :"libvirt" do |lv, override| + override.vm.box = "fedora/23-cloud-base" + end fedora.vm.provision "bootstrap", type: "shell", inline: $bootstrap_fedora fedora.vm.provision "configure_ovs", type: "shell", inline: $configure_ovs fedora.vm.provision "build_ovs", type: "shell", inline: $build_ovs