Correcting networking-odl to mitaka/stable + app topology patch

Change-Id: Iddcd8dda2d49fcdd8e0f37a1d052a6fa8a24b035
Signed-off-by: Wojciech Dec <wdec@cisco.com>

1 files changed, 8 insertions, 23 deletions

diff --git a/networking-odl/devstack/README.rst b/networking-odl/devstack/README.rst
index 2b4bd1c..ba6f716 100644
--- a/networking-odl/devstack/README.rst
+++ b/networking-odl/devstack/README.rst
@@ -16,23 +16,20 @@
      [[local|localrc]]
      enable_plugin networking-odl http://git.openstack.org/openstack/networking-odl
 
-4. Optionally, to enable support for OpenDaylight L3 router functionality,
-   add the below.
-   Note: This is only relevant when using old netvirt (ovsdb based, default)::
+4. Optionally, to enable support for OpenDaylight L3 router functionality, add the
+   below::
 
      > cat local.conf
      [[local|localrc]]
      ODL_L3=True
 
 5. If you need to route the traffic out of the box (e.g. br-ex), set
-   ODL_PROVIDER_MAPPINGS to map the physical provider network to device
-   mapping, as shown below::
+   ODL_PROVIDER_MAPPINGS to map the interface, as shown below::
 
      > cat local.conf
      [[local|localrc]]
      ODL_L3=True
-     ODL_PROVIDER_MAPPINGS=${ODL_PROVIDER_MAPPINGS:-br-ex:eth2}    # for old netvirt (ovsdb based)
-     ODL_PROVIDER_MAPPINGS=${ODL_PROVIDER_MAPPINGS:-physnet1:eth2} # for new netvirt (vpnservice based)
+     ODL_PROVIDER_MAPPINGS=${ODL_PROVIDER_MAPPINGS:-br-ex:eth2}
 
 6. Optionally, to enable support for OpenDaylight with LBaaS V2, add this::
 
@@ -44,8 +41,8 @@
 
 7. run ``stack.sh``
 
-8. Note: In a multi-node devstack environment, for each compute node you will
-   want to add this to the local.conf file::
+8. Note: In a multi-node devstack environment, for each compute node you will want to add this
+   to the local.conf file::
 
      > cat local.conf
      [[local|localrc]]
@@ -54,8 +51,8 @@
 
 9. Note: In a node using a release of Open vSwitch provided from another source
    than your Linux distribution you have to enable in your local.conf skipping
-   of OVS installation step by setting *SKIP_OVS_INSTALL=True*. For example
-   when stacking together with `networking-ovs-dpdk
+   of OVS installation step by setting *SKIP_OVS_INSTALL=True*. For example when
+   stacking together with `networking-ovs-dpdk
    <https://github.com/openstack/networking-ovs-dpdk/>`_ Neutron plug-in to
    avoid conflicts between openvswitch and ovs-dpdk you have to add this to
    the local.conf file::
@@ -66,15 +63,3 @@
      enable_plugin networking-odl http://git.openstack.org/openstack/networking-odl
      SKIP_OVS_INSTALL=True
      Q_ML2_PLUGIN_MECHANISM_DRIVERS=opendaylight
-
-10. Note: Optionally, to use the new netvirt implementation
-    (netvirt-vpnservice-openstack), add the following to the local.conf file
-    (only allinone topology is currently supported by devstack, since tunnel
-    endpoints are not automatically configured). For tunnel configurations
-    after loading devstack, please refer to this guide
-    https://wiki.opendaylight.org/view/Netvirt:_L2Gateway_HowTo#Configuring_Tunnels::
-
-      > cat local.conf
-      [[local|localrc]]
-      ODL_NETVIRT_KARAF_FEATURE=odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-netvirt-vpnservice-openstack
-      ODL_BOOT_WAIT_URL=restconf/operational/network-topology:network-topology/ # Workaround since netvirt:1 no longer exists in DS!