diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-08-25 20:18:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-08-25 20:18:57 +0000 |
| commit | 006fe1febcc31673d659fcf907fc4949b4fc644f (patch) | |
| tree | 7be35cb9b994fe84b3394e400e226fe2dc76b7c4 | |
| parent | 4cc77d768cc9a0ee8b9e9d80615d659e7a2a0239 (diff) | |
| parent | ce07603125e7110e5f5889fe9eaef55adab346ab (diff) | |
Merge "Fixup network configuration for ext-net"
| -rw-r--r-- | overcloud-source.yaml | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 5e6a2eef..073a62a3 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -106,9 +106,15 @@ parameters: description: Name of an existing EC2 KeyPair to enable SSH access to the instances type: string NeutronBridgeMappings: - description: The OVS logical->physical bridge mappings to use. - type: string - default: '' + description: | + The OVS logical->physical bridge mappings to use. See the Neutron + documentation for details. Defaults to mapping br-ex - the external + bridge on hosts - to a physical name 'datacentre' which can be used + to create provider networks (and we use this for the default floating + network) - if changing this either use different post-install network + scripts or be sure to keep 'datacentre' as a mapping network name. + type: string + default: "datacentre:br-ex" NeutronPassword: default: unset description: The password for the neutron service account, used by neutron agents. @@ -159,14 +165,19 @@ parameters: hidden: true NeutronFlatNetworks: type: string - default: '' - description: If set, flat networks to configure in neutron plugins. + default: 'datacentre' + description: | + If set, flat networks to configure in neutron plugins. Defaults to + 'datacentre' to permit external network creation. HypervisorNeutronPhysicalBridge: - default: '' - description: An OVS bridge to create on each hypervisor. + default: 'br-ex' + description: | + An OVS bridge to create on each hypervisor. This defaults to br-ex the + same as the control plane nodes, as we have a uniform configuration of + the openvswitch agent. Typically should not need to be changed. type: string HypervisorNeutronPublicInterface: - default: '' + default: 'eth0' description: What interface to add to the HypervisorNeutronPhysicalBridge. type: string NeutronPublicInterface: |