From ac556ffc750b7adaca9e5aab7caf2d35faf9cec4 Mon Sep 17 00:00:00 2001
From: Tong Liu <tongl@vmware.com>
Date: Wed, 14 Sep 2016 18:16:36 +0000
Subject: [PATCH] Add native DHCP config in nsxv3 sample local.conf

Add the config options in sample local.conf file to support native
DHCP & metadata proxy.

Change-Id: I32ee4b85216aa94fa0e2624e35c765764f86f595
---
 devstack/nsx_v3/controller_local.conf.sample  | 11 ++++++++++-
 devstack/nsx_v3/kvm_compute_local.conf.sample | 10 ++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/devstack/nsx_v3/controller_local.conf.sample b/devstack/nsx_v3/controller_local.conf.sample
index 043e73f884..c4ee4cc764 100644
--- a/devstack/nsx_v3/controller_local.conf.sample
+++ b/devstack/nsx_v3/controller_local.conf.sample
@@ -71,7 +71,10 @@ ENABLED_SERVICES+=,tempest
 
 # Neutron - Networking Service
 # If Neutron is not declared the old good nova-network will be used
-ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,neutron
+# If use agent to provider DHCP and metadata
+#ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,neutron
+# If use native DHCP support from NSX, q-dhcp & q-meta shouldn't be enabled
+ENABLED_SERVICES+=,q-svc,neutron
 
 ## Neutron - Load Balancing
 #ENABLED_SERVICES+=,q-lbaas
@@ -103,3 +106,9 @@ NSX_PASSWORD=<nsx-password>
 DEFAULT_TIER0_ROUTER_UUID=<tier0-router-uuid>
 # Default Edge cluster uuid
 DEFAULT_EDGE_CLUSTER_UUID=<edge-cluster-uuid>
+
+# Enabled native DHCP support from NSX backend
+DHCP_PROFILE_UUID=<dhcp-profile-uuid>
+METADATA_PROXY_UUID=<metadata-proxy-uuid>
+METADATA_PROXY_SHARED_SECRET=<metadata-proxy-secret>
+NATIVE_DHCP_METADATA=True
diff --git a/devstack/nsx_v3/kvm_compute_local.conf.sample b/devstack/nsx_v3/kvm_compute_local.conf.sample
index 45b1bed81c..9613b70719 100644
--- a/devstack/nsx_v3/kvm_compute_local.conf.sample
+++ b/devstack/nsx_v3/kvm_compute_local.conf.sample
@@ -30,3 +30,13 @@ VNCSERVER_PROXYCLIENT_ADDRESS=$VNCSERVER_LISTEN
 disable_service zookeeper
 #DEBUG=False
 #DEFAULT_VLAN_TZ_UUID=changeme     # Optional, for VLAN provider networks
+
+# Enable Logging
+LOGFILE=/opt/stack/logs/stack.sh.log
+VERBOSE=True
+LOG_COLOR=True
+SCREEN_LOGDIR=/opt/stack/logs
+
+NSX_MANAGER=<nsx-manager1-ip>
+NSX_USER=<nsx-manager-user>
+NSX_PASSWORD=<nsx-manager-password>