Make neutron public interface configurable.

Not all machines use eth0 :).

Change-Id: I2d0cfd8df46e7eda1b7db2ea5c8e84d3e970c862

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 8cb4596..f9ca995 100644 (file)
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -57,6 +57,10 @@ Parameters:
     Default: stack
     Description: What username to ssh to the virtual power host with.
     Type: String
+  NeutronPublicInterface:
+    Default: eth0
+    Description: What interface to bridge onto br-ex for network nodes.
+    Type: String
   notcomputeImage:
     Type: String
     Default: overcloud-control
@@ -265,7 +269,8 @@ Resources:
                 - Fn::GetAtt:
                   - notcompute
                   - networks
-          public_interface: eth0
+          public_interface:
+            Ref: NeutronPublicInterface
           physical_bridge: br-ex
           tenant_network_type: gre
         ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8

diff --git a/undercloud-bm.yaml b/undercloud-bm.yaml
index b4b23c1..3ce0e80 100644 (file)
--- a/undercloud-bm.yaml
+++ b/undercloud-bm.yaml
@@ -44,6 +44,10 @@ Parameters:
     Default: ''
     Type: String
     Description: Set truthy to enable Neutron native PXE.
+  NeutronPublicInterface:
+    Default: eth2
+    Description: What interface to bridge onto br-ex for network nodes.
+    Type: String
   NovaPassword:
     Default: unset
     Description: The password for the nova service account, used by nova-api.
@@ -157,7 +161,8 @@ Resources:
         ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
         ovs:
           dnsmasq_range: [192.0.2.25, 192.0.2.44]
-          public_interface: eth2
+          public_interface:
+            Ref: NeutronPublicInterface
           physical_bridge: br-ctlplane
           physical_network: ctlplane
           network_vlan_ranges: ctlplane

diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index a127409..871e573 100644 (file)
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -44,6 +44,10 @@ Parameters:
     Default: ''
     Type: String
     Description: Set truthy to enable Neutron native PXE.
+  NeutronPublicInterface:
+    Default: eth0
+    Description: What interface to bridge onto br-ex for network nodes.
+    Type: String
   NovaPassword:
     Default: unset
     Description: The password for the nova service account, used by nova-api.
@@ -167,7 +171,8 @@ Resources:
         ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
         ovs:
           dnsmasq_range: [192.0.2.25, 192.0.2.44]
-          public_interface: eth0
+          public_interface:
+            Ref: NeutronPublicInterface
           physical_bridge: br-ctlplane
           physical_network: ctlplane
           network_vlan_ranges: ctlplane