diff options
| author |   Robert Collins <rbtcollins@hp.com> | 2014-02-07 15:37:45 +1300 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2014-02-12 08:02:59 +1300 |
| commit | f0e61d11fc949cb9ebc3d2b875fdb79335ed0d33 (patch) | |
| tree | 840afb0a850b189b585101476940b32608935cde | |
| parent | 7337f851bac1a808bc134f4db459b620063fbc0c (diff) | |
Make it possible to do physical networks for VMs.
This patch makes it possible to setup physical networks for VMs,
separate to the control plane configuration which is needed for
routed/natted access to physical networks.
Future work is needed to automate ci-overcloud configuration of the
control plane where we need two distinct bridges, but this is enough
to stop folk dying of boredom setting up a sizeable ci-overcloud.
Change-Id: I6ac7129f22bb797467adb0408638781d20081f19
| -rw-r--r-- | nova-compute-instance.yaml | 10 | ||||
| -rw-r--r-- | overcloud-source.yaml | 12 |
2 files changed, 22 insertions, 0 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 15b5e19e..6c2671c0 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -29,6 +29,14 @@ Parameters: Description: If set, flat networks to configure in neutron plugins. NeutronHost: Type: String + NeutronPhysicalBridge: + Default: '' + Description: An OVS bridge to create for accessing external networks. + Type: String + NeutronPublicInterface: + Default: '' + Description: A port to add to the NeutronPhysicalBridge. + Type: String RabbitHost: Type: String RabbitPassword: @@ -169,6 +177,8 @@ Resources: network_vlan_ranges: {Ref: NeutronNetworkVLANRanges} bridge_mappings: {Ref: NeutronBridgeMappings} enable_tunneling: {Ref: NeutronEnableTunnelling} + physical_bridge: {Ref: NeutronPhysicalBridge} + public_interface: {Ref: NeutronPublicInterface} service-password: Ref: NeutronPassword admin-password: {Ref: AdminPassword} diff --git a/overcloud-source.yaml b/overcloud-source.yaml index bdbf7219..7fd7505f 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -81,6 +81,14 @@ Parameters: Type: String Default: '' Description: If set, flat networks to configure in neutron plugins. + HypervisorNeutronPhysicalBridge: + Default: '' + Description: An OVS bridge to create on each hypervisor. + Type: String + HypervisorNeutronPublicInterface: + Default: '' + Description: What interface to add to the HypervisorNeutronPhysicalBridge. + Type: String NeutronPublicInterface: Default: eth0 Description: What interface to bridge onto br-ex for network nodes. @@ -165,6 +173,10 @@ Resources: NeutronFlatNetworks: Ref: NeutronFlatNetworks NeutronNetworkVLANRanges: "" + NeutronPhysicalBridge: + Ref: HypervisorNeutronPhysicalBridge + NeutronPublicInterface: + Ref: HypervisorNeutronPublicInterface NeutronBridgeMappings: Ref: NeutronBridgeMappings RabbitPassword: "guest" |