diff --git a/devstack/override-defaults b/devstack/override-defaults
index 68d22335a..654f80584 100644
--- a/devstack/override-defaults
+++ b/devstack/override-defaults
@@ -40,15 +40,6 @@ if [[ -z ${ML2_L3_PLUGIN} ]]; then
     fi
 fi
 
-# OVS bridge definition
-Q_USE_PROVIDERNET_FOR_PUBLIC=${Q_USE_PROVIDERNET_FOR_PUBLIC:-False}
-PUBLIC_BRIDGE=${PUBLIC_BRIDGE:-br-ex}
-INTEGRATION_BRIDGE=${INTEGRATION_BRIDGE:-br-int}
-INTEGRATION_PEER_PORT=${INTEGRATION_PEER_PORT:-patch-ex}
-PUBLIC_PEER_PORT=${PUBLIC_PEER_PORT:-patch-int}
-PUBLIC_NETWORK_GATEWAY=${PUBLIC_NETWORK_GATEWAY:-172.24.4.1}
-PUBLIC_NETWORK_PREFIXLEN=${PUBLIC_NETWORK_PREFIXLEN:-24}
-
 if [[ "$ENABLE_DPDK" == "True" ]]; then
     # By default, dragonflow uses OVS kernel datapath. If you want to use
     # user space datapath powered by DPDK, please use 'netdev'.
diff --git a/devstack/settings b/devstack/settings
index 4dcdeddd7..2d27d5c3f 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -47,3 +47,11 @@ DF_REDIS_INSTALL_FROM_RUBY=${DF_REDIS_INSTALL_FROM_RUBY:-"True"}
 DF_RUBY_SOURCE_ADD=${DF_RUBY_SOURCE_ADD:-"https://rubygems.org/"}
 DF_RUBY_SOURCE_REMOVE=${DF_RUBY_SOURCE_REMOVE:-""}
 DF_SELECTIVE_TOPO_DIST=${DF_SELECTIVE_TOPO_DIST:-"False"}
+Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=${Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER:-"True"}
+
+# OVS bridges related defualts
+INTEGRATION_BRIDGE=${INTEGRATION_BRIDGE:-br-int}
+INTEGRATION_PEER_PORT=${INTEGRATION_PEER_PORT:-patch-ex}
+PUBLIC_PEER_PORT=${PUBLIC_PEER_PORT:-patch-int}
+PUBLIC_NETWORK_GATEWAY=${PUBLIC_NETWORK_GATEWAY:-172.24.4.1}
+PUBLIC_NETWORK_PREFIXLEN=${PUBLIC_NETWORK_PREFIXLEN:-24}
diff --git a/doc/source/multi-node-conf/cassandra_compute_node.conf b/doc/source/multi-node-conf/cassandra_compute_node.conf
index 07784ed1d..15d5d5525 100644
--- a/doc/source/multi-node-conf/cassandra_compute_node.conf
+++ b/doc/source/multi-node-conf/cassandra_compute_node.conf
@@ -2,7 +2,6 @@
 
 LOGFILE=$DEST/logs/stack.sh.log
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
 DF_SELECTIVE_TOPO_DIST=True
 DF_PUB_SUB=True
 ENABLE_NEUTRON_NOTIFIER=False
diff --git a/doc/source/multi-node-conf/cassandra_controller_node.conf b/doc/source/multi-node-conf/cassandra_controller_node.conf
index 2cae3b2c2..9b75df6d5 100644
--- a/doc/source/multi-node-conf/cassandra_controller_node.conf
+++ b/doc/source/multi-node-conf/cassandra_controller_node.conf
@@ -2,7 +2,6 @@
 
 LOGFILE=$DEST/logs/stack.sh.log
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
 DF_SELECTIVE_TOPO_DIST=True
 DF_PUB_SUB=True
 ENABLE_NEUTRON_NOTIFIER=False
diff --git a/doc/source/multi-node-conf/etcd_compute_node.conf b/doc/source/multi-node-conf/etcd_compute_node.conf
index 09cf8a96e..bc1eff2d4 100644
--- a/doc/source/multi-node-conf/etcd_compute_node.conf
+++ b/doc/source/multi-node-conf/etcd_compute_node.conf
@@ -8,8 +8,6 @@ SERVICE_PASSWORD=password
 SERVICE_TOKEN=password
 ADMIN_PASSWORD=password
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
-
 enable_plugin dragonflow https://git.openstack.org/openstack/dragonflow
 
 disable_all_services
diff --git a/doc/source/multi-node-conf/etcd_controller_node.conf b/doc/source/multi-node-conf/etcd_controller_node.conf
index e4286cad3..b2ec9c967 100644
--- a/doc/source/multi-node-conf/etcd_controller_node.conf
+++ b/doc/source/multi-node-conf/etcd_controller_node.conf
@@ -1,8 +1,6 @@
 [[local|localrc]]
 
 ETCD_VERSION=v3.0.15
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
-
 DATABASE_PASSWORD=password
 RABBIT_PASSWORD=password
 SERVICE_PASSWORD=password
diff --git a/doc/source/multi-node-conf/ramcloud_compute_node.conf b/doc/source/multi-node-conf/ramcloud_compute_node.conf
index db86e55a4..68c4391a5 100644
--- a/doc/source/multi-node-conf/ramcloud_compute_node.conf
+++ b/doc/source/multi-node-conf/ramcloud_compute_node.conf
@@ -16,8 +16,6 @@ SERVICE_PASSWORD=devstack
 SERVICE_TOKEN=devstack
 ADMIN_PASSWORD=devstack
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
-
 enable_plugin dragonflow https://git.openstack.org/openstack/dragonflow
 
 
diff --git a/doc/source/multi-node-conf/ramcloud_controller_node.conf b/doc/source/multi-node-conf/ramcloud_controller_node.conf
index d03abf8ee..4880fa08f 100644
--- a/doc/source/multi-node-conf/ramcloud_controller_node.conf
+++ b/doc/source/multi-node-conf/ramcloud_controller_node.conf
@@ -1,7 +1,5 @@
 [[local|localrc]]
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
-
 DATABASE_PASSWORD=password
 RABBIT_PASSWORD=password
 SERVICE_PASSWORD=password
diff --git a/doc/source/multi-node-conf/redis_compute_node_local_controller.conf b/doc/source/multi-node-conf/redis_compute_node_local_controller.conf
index a8837d08a..1dd7814c1 100644
--- a/doc/source/multi-node-conf/redis_compute_node_local_controller.conf
+++ b/doc/source/multi-node-conf/redis_compute_node_local_controller.conf
@@ -16,8 +16,6 @@ SERVICE_PASSWORD=password
 SERVICE_TOKEN=password
 ADMIN_PASSWORD=password
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
-
 enable_plugin dragonflow https://git.openstack.org/openstack/dragonflow
 
 disable_all_services
diff --git a/doc/source/multi-node-conf/redis_controller_node_local_controller.conf b/doc/source/multi-node-conf/redis_controller_node_local_controller.conf
index 8c321dcc9..ffb52ce1a 100644
--- a/doc/source/multi-node-conf/redis_controller_node_local_controller.conf
+++ b/doc/source/multi-node-conf/redis_controller_node_local_controller.conf
@@ -1,7 +1,5 @@
 [[local|localrc]]
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
-
 DATABASE_PASSWORD=password
 RABBIT_PASSWORD=password
 SERVICE_PASSWORD=password
diff --git a/doc/source/multi-node-conf/rethinkDB_compute_node.conf b/doc/source/multi-node-conf/rethinkDB_compute_node.conf
index b1a660a8d..c6e44c2a8 100644
--- a/doc/source/multi-node-conf/rethinkDB_compute_node.conf
+++ b/doc/source/multi-node-conf/rethinkDB_compute_node.conf
@@ -15,8 +15,6 @@ SERVICE_PASSWORD=password
 SERVICE_TOKEN=password
 ADMIN_PASSWORD=password
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
-
 enable_plugin dragonflow https://git.openstack.org/openstack/dragonflow
 
 
diff --git a/doc/source/multi-node-conf/rethinkDB_controller_node.conf b/doc/source/multi-node-conf/rethinkDB_controller_node.conf
index 62305c1a7..09a2d3d52 100644
--- a/doc/source/multi-node-conf/rethinkDB_controller_node.conf
+++ b/doc/source/multi-node-conf/rethinkDB_controller_node.conf
@@ -1,7 +1,5 @@
 [[local|localrc]]
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
-
 DATABASE_PASSWORD=password
 RABBIT_PASSWORD=password
 SERVICE_PASSWORD=password
diff --git a/doc/source/multi-node-conf/zookeeper_compute_node.conf b/doc/source/multi-node-conf/zookeeper_compute_node.conf
index caf31e4b2..53315c43c 100644
--- a/doc/source/multi-node-conf/zookeeper_compute_node.conf
+++ b/doc/source/multi-node-conf/zookeeper_compute_node.conf
@@ -5,8 +5,6 @@ LOGFILE=$DEST/logs/stack.sh.log
 #OFFLINE=True
 #RECLONE=False
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
-
 DATABASE_PASSWORD=password
 RABBIT_PASSWORD=password
 SERVICE_PASSWORD=password
diff --git a/doc/source/multi-node-conf/zookeeper_controller_node.conf b/doc/source/multi-node-conf/zookeeper_controller_node.conf
index 2bd14cddc..87c4e8575 100644
--- a/doc/source/multi-node-conf/zookeeper_controller_node.conf
+++ b/doc/source/multi-node-conf/zookeeper_controller_node.conf
@@ -5,8 +5,6 @@ LOGFILE=$DEST/logs/stack.sh.log
 #OFFLINE=True
 #RECLONE=False
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
-
 DATABASE_PASSWORD=password
 RABBIT_PASSWORD=password
 SERVICE_PASSWORD=password
diff --git a/doc/source/single-node-conf/cassandra_local_controller.conf b/doc/source/single-node-conf/cassandra_local_controller.conf
index 419b124aa..5f0ae580f 100644
--- a/doc/source/single-node-conf/cassandra_local_controller.conf
+++ b/doc/source/single-node-conf/cassandra_local_controller.conf
@@ -5,7 +5,6 @@ LOGFILE=$DEST/logs/stack.sh.log
 #OFFLINE=True
 #RECLONE=False
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
 DF_SELECTIVE_TOPO_DIST=True
 DF_PUB_SUB=True
 ENABLE_NEUTRON_NOTIFIER=False
diff --git a/doc/source/single-node-conf/etcd_local_controller.conf b/doc/source/single-node-conf/etcd_local_controller.conf
index 901fcb5bf..0a8b59912 100644
--- a/doc/source/single-node-conf/etcd_local_controller.conf
+++ b/doc/source/single-node-conf/etcd_local_controller.conf
@@ -1,7 +1,5 @@
 [[local|localrc]]
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
-
 DATABASE_PASSWORD=password
 RABBIT_PASSWORD=password
 SERVICE_PASSWORD=password
diff --git a/doc/source/single-node-conf/ramcloud_local_controller.conf b/doc/source/single-node-conf/ramcloud_local_controller.conf
index 544072ef4..41afe7812 100644
--- a/doc/source/single-node-conf/ramcloud_local_controller.conf
+++ b/doc/source/single-node-conf/ramcloud_local_controller.conf
@@ -1,7 +1,5 @@
 [[local|localrc]]
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
-
 DATABASE_PASSWORD=password
 RABBIT_PASSWORD=password
 SERVICE_PASSWORD=password
diff --git a/doc/source/single-node-conf/redis_local_controller.conf b/doc/source/single-node-conf/redis_local_controller.conf
index 8187efaa0..cf303bc49 100644
--- a/doc/source/single-node-conf/redis_local_controller.conf
+++ b/doc/source/single-node-conf/redis_local_controller.conf
@@ -1,7 +1,5 @@
 [[local|localrc]]
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
-
 DATABASE_PASSWORD=password
 RABBIT_PASSWORD=password
 SERVICE_PASSWORD=password
diff --git a/doc/source/single-node-conf/rethinkDB_local_controller.conf b/doc/source/single-node-conf/rethinkDB_local_controller.conf
index 158cfd2d5..3f75dcf53 100644
--- a/doc/source/single-node-conf/rethinkDB_local_controller.conf
+++ b/doc/source/single-node-conf/rethinkDB_local_controller.conf
@@ -1,7 +1,5 @@
 [[local|localrc]]
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
-
 DATABASE_PASSWORD=password
 RABBIT_PASSWORD=password
 SERVICE_PASSWORD=password
diff --git a/doc/source/single-node-conf/zookeeper_local_controller.conf b/doc/source/single-node-conf/zookeeper_local_controller.conf
index 3440b925d..a8ba54b50 100644
--- a/doc/source/single-node-conf/zookeeper_local_controller.conf
+++ b/doc/source/single-node-conf/zookeeper_local_controller.conf
@@ -5,8 +5,6 @@ LOGFILE=$DEST/logs/stack.sh.log
 #OFFLINE=True
 #RECLONE=False
 
-Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
-
 DATABASE_PASSWORD=password
 RABBIT_PASSWORD=password
 SERVICE_PASSWORD=password