Merge "Add support for neutron provider networks"

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: []

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"

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