diff options
| author |   Robert Collins <rbtcollins@hp.com> | 2013-10-11 21:06:43 +1300 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2013-10-11 21:06:43 +1300 |
| commit | 270aa4441c256d913aca12588b5cbabe09a1229d (patch) | |
| tree | 6427a28c79dbd21c4f0719d61b8c14849e07f23e | |
| parent | f8175fb55fd3d0a7c76ac8030157e02347c61525 (diff) | |
Make neutron public interface configurable.
Not all machines use eth0 :).
Change-Id: I2d0cfd8df46e7eda1b7db2ea5c8e84d3e970c862
| -rw-r--r-- | overcloud-source.yaml | 7 | ||||
| -rw-r--r-- | undercloud-bm.yaml | 7 | ||||
| -rw-r--r-- | undercloud-vm.yaml | 7 |
3 files changed, 18 insertions, 3 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 8cb4596c..f9ca995a 100644 --- 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 b4b23c1b..3ce0e80f 100644 --- 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 a1274094..871e5731 100644 --- 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 |