summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2013-10-11 21:51:50 +1300
committerRobert Collins <rbtcollins@hp.com>2013-10-12 00:03:42 +1300
commit5eee774cf2b138837b82f5bb681a9a6e677008ed (patch)
tree30473cd8902df602f5b6a77b652bd1817c818f26
parenta96bc4b329affded94fe2ee85bd9b85926e0a5fe (diff)
Allow making the public interface a vlan.
In the CD overcloud we need to use a VLAN for public traffic. Change-Id: I8d674e1ae58063d9be338023819f174d1bc028e4
-rw-r--r--overcloud-source.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 514ada9b..e225df56 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -65,6 +65,10 @@ Parameters:
Default: ''
Description: A custom IP address to put onto the NeutronPublicInterface.
Type: String
+ NeutronPublicInterfaceRawDevice:
+ Default: ''
+ Description: If set, the public interface is a vlan with this device as the raw device.
+ Type: String
notcomputeImage:
Type: String
Default: overcloud-control
@@ -278,6 +282,8 @@ Resources:
- networks
public_interface:
Ref: NeutronPublicInterface
+ public_interface_raw_device:
+ Ref: NeutronPublicInterfaceRawDevice
physical_bridge: br-ex
tenant_network_type: gre
ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8