From 3a5deb7ce9d4945645e9163244cfa2176441fe3c Mon Sep 17 00:00:00 2001
From: Brian Haley <bhaley@redhat.com>
Date: Mon, 6 Apr 2020 16:45:43 -0400
Subject: [PATCH] Update the devstack local.conf sample file

local.conf.sample was a little out-dated and failed
stacking.  Update to be more like the neutron sample
file with the added Octavia and OVN provider sections.

Change-Id: I38df77012d63efd1e8769c13ed35a017d4cb6141
---
 devstack/local.conf.sample | 52 +++++++++++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 4 deletions(-)

diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample
index 03550425..0975e0f8 100644
--- a/devstack/local.conf.sample
+++ b/devstack/local.conf.sample
@@ -14,17 +14,37 @@ RABBIT_PASSWORD=password
 SERVICE_PASSWORD=password
 SERVICE_TOKEN=password
 ADMIN_PASSWORD=password
+SERVICE_PASSWORD=$ADMIN_PASSWORD
 
+# Logging
+# -------
+
+# By default ``stack.sh`` output only goes to the terminal where it runs.  It can
+# be configured to additionally log to a file by setting ``LOGFILE`` to the full
+# path of the destination log file.  A timestamp will be appended to the given name.
 LOGFILE=$DEST/logs/stack.sh.log
 
+# Old log files are automatically removed after 7 days to keep things neat.  Change
+# the number of days by setting ``LOGDAYS``.
+LOGDAYS=2
+
+# Nova logs will be colorized if ``SYSLOG`` is not set; turn this off by setting
+# ``LOG_COLOR`` false.
+#LOG_COLOR=False
+
+# Enable OVN
 Q_AGENT=ovn
 Q_ML2_PLUGIN_MECHANISM_DRIVERS=ovn,logger
 Q_ML2_PLUGIN_TYPE_DRIVERS=local,flat,vlan,geneve
 Q_ML2_TENANT_NETWORK_TYPE="geneve"
 
+# Enable OVN services
 enable_service ovn-northd
 enable_service ovn-controller
-enable_service neutron-ovn-metadata-agent
+enable_service q-ovn-metadata-agent
+
+# Use Neutron
+enable_service q-svc
 
 # Disable Neutron agents not used with OVN.
 disable_service q-agt
@@ -46,15 +66,39 @@ disable_service horizon
 # DevStack a bit. You may enable it here if you would like to use it.
 disable_service cinder c-sch c-api c-vol
 
+# A UUID to uniquely identify this system.  If one is not specified, a random
+# one will be generated and saved in the file 'ovn-uuid' for re-use in future
+# DevStack runs.
+#OVN_UUID=
+
+# If using the OVN native layer-3 service, choose a router scheduler to
+# manage the distribution of router gateways on hypervisors/chassis.
+# Default value is leastloaded.
+#OVN_L3_SCHEDULER=leastloaded
+
+# Whether or not to build custom openvswitch kernel modules from the ovs git
+# tree. This is enabled by default.  This is required unless your distro kernel
+# includes ovs+conntrack support.  This support was first released in Linux 4.3,
+# and will likely be backported by some distros.
+#OVN_BUILD_MODULES=False
+
+# If the admin wants to enable this chassis to host gateway routers for
+# external connectivity, then set ENABLE_CHASSIS_AS_GW to True.
+# Then devstack will set ovn-cms-options with enable-chassis-as-gw
+# in Open_vSwitch table's external_ids column.
+# If this option is not set on any chassis, all the of them with bridge
+# mappings configured will be eligible to host a gateway.
 ENABLE_CHASSIS_AS_GW=True
 
 # If you wish to use the provider network for public access to the cloud,
 # set the following
-Q_USE_PROVIDERNET_FOR_PUBLIC=True
+#Q_USE_PROVIDERNET_FOR_PUBLIC=True
+
 # Create public bridge
-# This needs to be equalized with Neutron devstack
 OVN_L3_CREATE_PUBLIC_NETWORK=True
-PUBLIC_NETWORK_GATEWAY="172.24.5.1"
+
+# This needs to be equalized with Neutron devstack
+PUBLIC_NETWORK_GATEWAY="172.24.4.1"
 
 # Octavia configuration
 OCTAVIA_NODE="api"