From 14fac8241f36dc3a8820dd808eee04d701a0bfcf Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Mon, 17 Dec 2018 17:35:37 +0100
Subject: [PATCH] Vagrantfile: configure to pass neutron test cases

Change-Id: I3321af0587daec17d71905cca41afaab9acbd1bd
---
 Vagrantfile                 |  2 +-
 devstack/vagrant/local.conf | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 99dd768ac..b28277e81 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -8,7 +8,7 @@ VAGRANTFILE_API_VERSION = "2"
 CPUS = 2
 
 # Customize the amount of memory on the VM
-MEMORY = 8192
+MEMORY = 12288
 
 # Every Vagrant development environment requires a box. You can search for
 # boxes at https://vagrantcloud.com/search.
diff --git a/devstack/vagrant/local.conf b/devstack/vagrant/local.conf
index d45fb8116..47f31a28c 100644
--- a/devstack/vagrant/local.conf
+++ b/devstack/vagrant/local.conf
@@ -11,19 +11,29 @@ DATABASE_PASSWORD=secret
 RABBIT_PASSWORD=secret
 SERVICE_PASSWORD=secret
 
-# User python 3
+# Use python 3
 USE_PYTHON3=true
 
-# Configure heat services ----------------------------------------------------
+
+# Configure Heat --------------------------------------------------------------
+
 enable_plugin heat https://git.openstack.org/openstack/heat
 
+# Configure Glance ------------------------------------------------------------
+
 # download and register a VM image that heat can launch
 IMAGE_URL_SITE="https://download.fedoraproject.org"
 IMAGE_URL_PATH="/pub/fedora/linux/releases/29/Cloud/x86_64/images/"
 IMAGE_URL_FILE="Fedora-Cloud-Base-29-1.2.x86_64.qcow2"
 IMAGE_URLS+=","$IMAGE_URL_SITE$IMAGE_URL_PATH$IMAGE_URL_FILE
 
-# Configure neutron ----------------------------------------------------------
+# Configure Nova --------------------------------------------------------------
+
+DEFAULT_INSTANCE_TYPE=ds512M
+
+
+# Configure Neutron -----------------------------------------------------------
+
 enable_service neutron
 NETWORK_API_EXTENSIONS=address-scope,agent,allowed-address-pairs,auto-allocated-topology,availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,dns-domain-ports,dns-integration,dvr,empty-string-filtering,ext-gw-mode,external-net,extra_dhcp_opt,extraroute,filter-validation,fip-port-details,flavors,ip-substring-filtering,l3-flavors,l3-ha,l3_agent_scheduler,logging,metering,multi-provider,net-mtu,net-mtu-writable,network-ip-availability,network_availability_zone,pagination,port-security,project-id,provider,qos,qos-bw-minimum-ingress,qos-fip,quotas,quota_details,rbac-policies,router,router_availability_zone,security-group,port-mac-address-regenerate,port-security-groups-filtering,segment,service-type,sorting,standard-attr-description,standard-attr-revisions,standard-attr-segment,standard-attr-timestamp,standard-attr-tag,subnet_allocation,trunk,trunk-details,uplink-status-propagation
 
@@ -50,5 +60,7 @@ IP_VERSION=4
 # IPV6_ADDRS_SAFE_TO_USE=fd$IPV6_GLOBAL_ID::/56
 # IPV6_PRIVATE_NETWORK_GATEWAY=fd$IPV6_GLOBAL_ID::1
 
-#  Enable tobiko plugin ------------------------------------------------------
+
+# Configure Tobiko ------------------------------------------------------------
+
 enable_plugin tobiko /vagrant