diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-10 14:46:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-10 14:46:35 +0000 |
| commit | a671a30b5196aa5953576928be526d70aed265fe (patch) | |
| tree | 0b5e3280f91691601f133b5425d1df86899063cd /overcloud.yaml | |
| parent | dae80694cbd9dee56ea9a530c421b6a2f456a691 (diff) | |
| parent | 08a201e23853455ffce6ff0d6c72163547ae7c06 (diff) | |
Merge "composable neutron server"
Diffstat (limited to 'overcloud.yaml')
| -rw-r--r-- | overcloud.yaml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index 85f344ab..73f4a2b1 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -636,6 +636,7 @@ parameters: - OS::TripleO::Services::NeutronDhcpAgent - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronMetadataAgent + - OS::TripleO::Services::NeutronServer - OS::TripleO::Services::RabbitMQ - OS::TripleO::Services::HAproxy - OS::TripleO::Services::Keepalived @@ -929,8 +930,6 @@ resources: NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers} NeutronPluginExtensions: {get_param: NeutronPluginExtensions} NeutronAgentExtensions: {get_param: NeutronAgentExtensions} - NeutronAllowL3AgentFailover: {get_param: NeutronAllowL3AgentFailover} - NeutronL3HA: {get_param: NeutronL3HA} NeutronNetworkType: {get_param: NeutronNetworkType} NeutronTunnelTypes: {get_param: NeutronTunnelTypes} NovaIPv6: {get_param: NovaIPv6} |