VMWare-NSXv: VMWare NSXv configuration file

For Kilo, the vendor-specific code should be moved to stackforge repo,
excluding the configuration files (https://review.openstack.org/#/c/134680/).

This patch adds config options for vmware NSXv plugin

Partially-Implements: blueprint vmware-nsx-v

Change-Id: Ibf8e9e1983d47b23397d00dfd4123a39049b0af2
Signed-off-by: Roey Chen <roeyc@vmware.com>

diff --git a/etc/neutron/plugins/vmware/nsx.ini b/etc/neutron/plugins/vmware/nsx.ini
index a9bf5c5e0000d54113ea0dd0673468ef066ac0d1..3c7c68288de6776a8a50a3fc7afd1d8c15a3e70d 100644 (file)
--- a/etc/neutron/plugins/vmware/nsx.ini
+++ b/etc/neutron/plugins/vmware/nsx.ini
@@ -48,19 +48,22 @@
 # number of network gateways allowed per tenant, -1 means unlimited
 # quota_network_gateway = 5
 
-[vcns]
-# URL for VCNS manager
+[nsxv]
+# URL for NSXv manager
 # manager_uri = https://management_ip
 
-# User name for VCNS manager
+# User name for NSXv manager
 # user = admin
 
-# Password for VCNS manager
+# Password for NSXv manager
 # password = default
 
-# (Optional) Datacenter ID for Edge deployment
+# (Required) Datacenter ID for Edge deployment
 # datacenter_moid =
 
+# (Required) Cluster IDs for clusters containing OpenStack hosts
+# cluster_moid =
+
 # (Optional) Deployment Container ID for NSX Edge deployment
 # If not specified, either a default global container will be used, or
 # the resource pool and datastore specified below will be used
@@ -79,6 +82,28 @@
 # default is 2000 (millisecond)
 # task_status_check_interval = 2000
 
+# (Optional) Network scope ID for VXLAN virtual wires
+# vdn_scope_id =
+
+# (Optional) DVS ID for VLANS
+# dvs_id =
+
+# (ListOpt) Define backup edge pool's management range with the four-tuple:
+# <edge_type>:[edge_size]:<minimum_pooled_edges>:<maximum_pooled_edges>.
+# edge_type:'service'(service edge) or 'vdr'(distributed edge).
+# edge_size: 'compact', 'large'(by default), 'xlarge' or 'quadlarge'.
+#
+# By default, edge pool manager would manage service edge
+# with compact&&large size and distributed edge with large size as following:
+# backup_edge_pool = service:large:4:10,service:compact:4:10,vdr:large:4:10
+
+# (Optional) Maximum number of sub interfaces supported per vnic in edge
+# default is 20
+# maximum_tunnels_per_vnic = 20
+
+# Maximum number of API retries
+# retries = 10
+
 [nsx]
 # Maximum number of ports for each bridged logical switch
 # The recommended value for this parameter varies with NSX version