From 68bcda18cbea4a44ce3efb85fbc7090310dbf794 Mon Sep 17 00:00:00 2001
From: Christian Zunker <christian.zunker@codecentric.cloud>
Date: Sun, 11 Nov 2018 18:09:16 +0100
Subject: [PATCH] Fix OVS scenario with changes introduced with Queens

The variable openstack_host_specific_kernel_modules was
moved to group vars file.

Change-Id: Icf875a611082855d00bfd21e2b32379630bfc32f
Closes-Bug: #1802740
---
 doc/source/app-openvswitch-dvr.rst | 11 ++++++++---
 doc/source/app-openvswitch.rst     | 11 ++++++++---
 doc/source/app-ovn.rst             | 11 ++++++++---
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/doc/source/app-openvswitch-dvr.rst b/doc/source/app-openvswitch-dvr.rst
index ab78c2b1..a4d504ce 100644
--- a/doc/source/app-openvswitch-dvr.rst
+++ b/doc/source/app-openvswitch-dvr.rst
@@ -32,8 +32,8 @@ Configure your networking according the Open vSwitch setup:
 OpenStack-Ansible user variables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Set the following user variables in your
-``/etc/openstack_deploy/user_variables.yml``:
+Create a group var file for your network hosts
+``/etc/openstack_deploy/group_vars/network_hosts``. It has to include:
 
 .. code-block:: yaml
 
@@ -41,7 +41,12 @@ Set the following user variables in your
   openstack_host_specific_kernel_modules:
     - name: "openvswitch"
       pattern: "CONFIG_OPENVSWITCH"
-      group: "network_hosts"
+
+
+Set the following user variables in your
+``/etc/openstack_deploy/user_variables.yml``:
+
+.. code-block:: yaml
 
   ### neutron specific config
   neutron_plugin_type: ml2.ovs.dvr
diff --git a/doc/source/app-openvswitch.rst b/doc/source/app-openvswitch.rst
index 20351ff0..305944eb 100644
--- a/doc/source/app-openvswitch.rst
+++ b/doc/source/app-openvswitch.rst
@@ -131,8 +131,8 @@ here: `<http://www.opencloudblog.com/?p=240>`_
 OpenStack-Ansible user variables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Set the following user variables in your
-``/etc/openstack_deploy/user_variables.yml``: *
+Create a group var file for your network hosts
+``/etc/openstack_deploy/group_vars/network_hosts``. It has to include:
 
 .. code-block:: yaml
 
@@ -140,7 +140,12 @@ Set the following user variables in your
   openstack_host_specific_kernel_modules:
     - name: "openvswitch"
       pattern: "CONFIG_OPENVSWITCH"
-      group: "network_hosts"
+
+
+Set the following user variables in your
+``/etc/openstack_deploy/user_variables.yml``: *
+
+.. code-block:: yaml
 
   ### neutron specific config
   neutron_plugin_type: ml2.ovs
diff --git a/doc/source/app-ovn.rst b/doc/source/app-ovn.rst
index 4c22b150..fa8a7296 100644
--- a/doc/source/app-ovn.rst
+++ b/doc/source/app-ovn.rst
@@ -47,8 +47,8 @@ Prerequisites
 OpenStack-Ansible user variables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Set the following user variables in your
-``/etc/openstack_deploy/user_variables.yml``:
+Create a group var file for your network hosts
+``/etc/openstack_deploy/group_vars/network_hosts``. It has to include:
 
 .. code-block:: yaml
 
@@ -56,7 +56,12 @@ Set the following user variables in your
   openstack_host_specific_kernel_modules:
     - name: "openvswitch"
       pattern: "CONFIG_OPENVSWITCH"
-      group: "network_hosts"
+
+
+Set the following user variables in your
+``/etc/openstack_deploy/user_variables.yml``:
+
+.. code-block:: yaml
 
   neutron_plugin_type: ml2.ovn