diff options
| author |   Robert Collins <rbtcollins@hp.com> | 2014-02-04 13:07:03 +1300 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2014-02-04 13:07:03 +1300 |
| commit | 930163894204ab0b64e8830a4e91645c8e3acc9e (patch) | |
| tree | 95be5cfd5a02803cc1a88858a087e49916673e67 | |
| parent | 1fbf8ac0dc7469b3c8fff538ecf9e883e83332a6 (diff) | |
Support neutron.flat-networks in overclouds.
This is needed to allow configuring the template in
I9fa923b63033edb694720bfe5fc756a7c0fbfd2a.
Change-Id: I65810db156cb3d93291ac56fcf96e3ed2c87e1b2
| -rw-r--r-- | nova-compute-instance.yaml | 5 | ||||
| -rw-r--r-- | overcloud-source.yaml | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 4b6a8a05..15b5e19e 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -23,6 +23,10 @@ Parameters: Default: overcloud-compute KeystoneHost: Type: String + NeutronFlatNetworks: + Type: String + Default: '' + Description: If set, flat networks to configure in neutron plugins. NeutronHost: Type: String RabbitHost: @@ -149,6 +153,7 @@ Resources: keystone: host: {Ref: KeystoneHost} neutron: + flat-networks: {Ref: NeutronFlatNetworks} host: {Ref: NeutronHost} ovs_db: {Ref: NeutronDSN} ovs: diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 78ce4aa0..a102e174 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -81,6 +81,10 @@ Parameters: Default: stack Description: What username to ssh to the virtual power host with. Type: String + NeutronFlatNetworks: + Type: String + Default: '' + Description: If set, flat networks to configure in neutron plugins. NeutronPublicInterface: Default: eth0 Description: What interface to bridge onto br-ex for network nodes. @@ -162,6 +166,8 @@ Resources: NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ]}, '/neutron']]} NeutronNetworkType: "gre" NeutronEnableTunnelling: "True" + NeutronFlatNetworks: + Ref: NeutronFlatNetworks NeutronNetworkVLANRanges: "" NeutronBridgeMappings: Ref: NeutronBridgeMappings @@ -280,6 +286,7 @@ Resources: - notCompute0 - networks neutron: + flat-networks: {Ref: NeutronFlatNetworks} host: Fn::Select: - 0 |