From 2803950422549e1eb0951b5667fa9eb67a1a3d5b Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 21 Jun 2018 13:16:23 +0000
Subject: [PATCH] Add support for neutron provider networks

Kolla provides a flag, enable_neutron_provider_networks, to enable
virtualised compute nodes to access provider (e.g. flat, VLAN) networks.

In kayobe, we now connect compute nodes to the external networks when
this flag is set. This ensures that the OVS network on compute nodes
is wired into the external networks.

Change-Id: Ida3d8eb2e2bfc95f6007c105ce410b3e5d360afe
Story: 2002636
Task: 22278
---
 ansible/group_vars/all/compute | 7 ++++---
 ansible/group_vars/all/kolla   | 1 +
 ansible/network.yml            | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ansible/group_vars/all/compute b/ansible/group_vars/all/compute
index 3366351e8..a31e6db65 100644
--- a/ansible/group_vars/all/compute
+++ b/ansible/group_vars/all/compute
@@ -16,9 +16,10 @@ compute_network_interfaces: >
 
 # List of default networks to which compute nodes are attached.
 compute_default_network_interfaces: >
-  {{ [provision_oc_net_name,
-      internal_net_name,
-      storage_net_name] | unique | list }}
+  {{ ([provision_oc_net_name,
+       internal_net_name,
+       storage_net_name] +
+      (external_net_names if kolla_enable_neutron_provider_networks | bool else [])) | unique | list }}
 
 # List of extra networks to which compute nodes are attached.
 compute_extra_network_interfaces: []
diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla
index c7e1e2ab9..5fc45ee29 100644
--- a/ansible/group_vars/all/kolla
+++ b/ansible/group_vars/all/kolla
@@ -324,6 +324,7 @@ kolla_enable_monasca: "no"
 kolla_enable_murano: "no"
 kolla_enable_neutron: "yes"
 kolla_enable_neutron_lbaas: "no"
+kolla_enable_neutron_provider_networks: "no"
 kolla_enable_nova: "yes"
 kolla_enable_osprofiler: "no"
 kolla_enable_sahara: "no"
diff --git a/ansible/network.yml b/ansible/network.yml
index e027c5764..c92794152 100644
--- a/ansible/network.yml
+++ b/ansible/network.yml
@@ -72,7 +72,7 @@
 # Configure virtual ethernet patch links to connect the workload provision
 # and external network bridges to the Neutron OVS bridge.
 - name: Ensure OVS patch links exist
-  hosts: network
+  hosts: network:compute
   tags:
     - config
     - network