Pass options from local.conf ot tobiko.conf

Change-Id: I4fb90736e53e0ed90370cdc150a4fe4fbc7fc947

devstack/vagrant/local.conf

@@ -14,10 +14,7 @@ SERVICE_PASSWORD=secret
 # User python 3
 USE_PYTHON3=true
 
-#  Enable tobiko plugin
-enable_plugin tobiko /vagrant
-
-#Enable heat services
+# Configure heat services ----------------------------------------------------
 enable_plugin heat https://git.openstack.org/openstack/heat
 
 # download and register a VM image that heat can launch
@@ -26,7 +23,7 @@ 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 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
 
@@ -52,3 +49,6 @@ IP_VERSION=4
 # IPV6_ADDRESS_MODE=slaac
 # IPV6_ADDRS_SAFE_TO_USE=fd$IPV6_GLOBAL_ID::/56
 # IPV6_PRIVATE_NETWORK_GATEWAY=fd$IPV6_GLOBAL_ID::1
+
+#  Enable tobiko plugin ------------------------------------------------------
+enable_plugin tobiko /vagrant