diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-04-08 14:16:34 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-05-18 08:25:00 -0400 |
| commit | 59e2f29fd1a43bee6a6d59d655c6ba579597f67e (patch) | |
| tree | 74fc4b29c003b4abf11ec154560f8edef7dc0e0f /overcloud.yaml | |
| parent | d6574fa32a0954aea02684984d9a93c444ec34f0 (diff) | |
composable neutron l3 service
Adds new puppet and puppet pacemaker specific services for
the Neutron L3 agent.
Partially-implements: blueprint composable-services-within-roles
Change-Id: I0316043efe357a41ef3b4088a55d98dbb6d25963
Diffstat (limited to 'overcloud.yaml')
| -rw-r--r-- | overcloud.yaml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index cf20b512..3fbfbe52 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -118,10 +118,6 @@ parameters: default: false description: Enable IPv6 features in Memcached. type: boolean - NeutronExternalNetworkBridge: - description: Name of bridge used for external network traffic. - type: string - default: 'br-ex' NeutronBridgeMappings: description: > The OVS logical->physical bridge mappings to use. See the Neutron @@ -668,6 +664,7 @@ parameters: - OS::TripleO::Services::GlanceApi - OS::TripleO::Services::GlanceRegistry - OS::TripleO::Services::NeutronDhcpAgent + - OS::TripleO::Services::NeutronL3Agent description: A list of service resources (configured in the Heat resource_registry) which represent nested stacks for each service that should get installed on the Controllers. @@ -928,7 +925,6 @@ resources: NeutronFlatNetworks: {get_param: NeutronFlatNetworks} NeutronBridgeMappings: {get_param: NeutronBridgeMappings} NeutronTenantMtu: {get_param: NeutronTenantMtu} - NeutronExternalNetworkBridge: {get_param: NeutronExternalNetworkBridge} NeutronEnableTunnelling: {get_param: NeutronEnableTunnelling} NeutronEnableL2Pop: {get_param: NeutronEnableL2Pop} NeutronNetworkVLANRanges: {get_param: NeutronNetworkVLANRanges} |