aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova-compute-instance.yaml10
-rw-r--r--overcloud-source.yaml12
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"