openstack/dragonflow
Code Issues Proposed changes

Revisit devstack defaults

Browse Source 
* Move OVS related defaults from override-defaults to settings
* Add default value to Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER
* Removed PUBLIC_BRIDGE as our defualt matches devstack
* Removed Q_USE_PROVIDERNET_FOR_PUBLIC which will now be true by
default. This will make `public` network flat rather than VxLAN so we
can reach its ports through br-ex

Change-Id: I2cef4e6b565d83860ce700aae2b498a9aa129ce3
This commit is contained in:
Dima Kuznetsov 2017-08-31 10:30:33 +03:00
parent db18524d72
commit bf461a5cb9
20 changed files with 8 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devstack/override-defaults
View File

@ -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'.

8
devstack/settings
View File

@ -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}

1
doc/source/multi-node-conf/cassandra_compute_node.conf
View File

@ -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

1
doc/source/multi-node-conf/cassandra_controller_node.conf
View File

@ -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

2
doc/source/multi-node-conf/etcd_compute_node.conf
View File

@ -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

2
doc/source/multi-node-conf/etcd_controller_node.conf
View File

@ -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

2
doc/source/multi-node-conf/ramcloud_compute_node.conf
View File

@ -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

2
doc/source/multi-node-conf/ramcloud_controller_node.conf
View File

@ -1,7 +1,5 @@
[[local|localrc]]
Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
DATABASE_PASSWORD=password
RABBIT_PASSWORD=password
SERVICE_PASSWORD=password

2
doc/source/multi-node-conf/redis_compute_node_local_controller.conf
View File

@ -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

2
doc/source/multi-node-conf/redis_controller_node_local_controller.conf
View File

@ -1,7 +1,5 @@
[[local|localrc]]
Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
DATABASE_PASSWORD=password
RABBIT_PASSWORD=password
SERVICE_PASSWORD=password

2
doc/source/multi-node-conf/rethinkDB_compute_node.conf
View File

@ -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

2
doc/source/multi-node-conf/rethinkDB_controller_node.conf
View File

@ -1,7 +1,5 @@
[[local|localrc]]
Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
DATABASE_PASSWORD=password
RABBIT_PASSWORD=password
SERVICE_PASSWORD=password

2
doc/source/multi-node-conf/zookeeper_compute_node.conf
View File

@ -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

2
doc/source/multi-node-conf/zookeeper_controller_node.conf
View File

@ -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

1
doc/source/single-node-conf/cassandra_local_controller.conf
View File

@ -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

2
doc/source/single-node-conf/etcd_local_controller.conf
View File

@ -1,7 +1,5 @@
[[local|localrc]]
Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
DATABASE_PASSWORD=password
RABBIT_PASSWORD=password
SERVICE_PASSWORD=password

2
doc/source/single-node-conf/ramcloud_local_controller.conf
View File

@ -1,7 +1,5 @@
[[local|localrc]]
Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
DATABASE_PASSWORD=password
RABBIT_PASSWORD=password
SERVICE_PASSWORD=password

2
doc/source/single-node-conf/redis_local_controller.conf
View File

@ -1,7 +1,5 @@
[[local|localrc]]
Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
DATABASE_PASSWORD=password
RABBIT_PASSWORD=password
SERVICE_PASSWORD=password

2
doc/source/single-node-conf/rethinkDB_local_controller.conf
View File

@ -1,7 +1,5 @@
[[local|localrc]]
Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True
DATABASE_PASSWORD=password
RABBIT_PASSWORD=password
SERVICE_PASSWORD=password

2
doc/source/single-node-conf/zookeeper_local_controller.conf
View File

@ -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