Merge pull request #383 from gryf/master

Documentation update

doc/source/installation/devstack/basic.rst

@@ -53,9 +53,6 @@ Now edit ``devstack/local.conf`` to set up some initial options:
 
 * If you have multiple network interfaces, you need to set ``HOST_IP`` variable
   to the IP on the interface you want to use as DevStack's primary.
-* ``KURYR_K8S_LBAAS_USE_OCTAVIA`` can be set to False if you want more
-  lightweight installation. In that case installation of Glance and Nova will
-  be omitted.
 * If you already have Docker installed on the machine, you can comment out line
   starting with ``enable_plugin devstack-plugin-container``.
 

doc/source/installation/network_policy.rst

@@ -94,12 +94,19 @@ to add the policy, pod_label and namespace handler and drivers with:
 
    If the loadbalancer maintains the source IP (such as ovn-octavia driver),
    there is no need to enforce sg rules at the load balancer level. To disable
-   the enforcement, you need to set the following variable:
+   the enforcement, you need to set the following variable in DevStack's
+   local.conf:
 
    .. code-block:: bash
 
       KURYR_ENFORCE_SG_RULES=False
 
+   To set that directly in kuryr.conf, the config to be set is:
+
+   .. code-block:: ini
+
+      [octavia_defaults]
+      enforce_sg_rules=False
 
 Testing the network policy support functionality
 ------------------------------------------------