diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-05-11 12:48:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-05-11 12:48:35 +0000 |
| commit | 0d3dacec4b63fb168f4f039501dc6e7b9622315b (patch) | |
| tree | 7a4d9deadd321757a8153c4e649b09585e273d68 /environments/neutron-opencontrail.yaml | |
| parent | c2cd6f01dc18901a33bd04ffe71ef00613fc3744 (diff) | |
| parent | 27f7d220bd5a9d0a1deebe16dd1d6a3dee11af82 (diff) | |
Merge "composable neutron dhcp service"
Diffstat (limited to 'environments/neutron-opencontrail.yaml')
| -rw-r--r-- | environments/neutron-opencontrail.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/environments/neutron-opencontrail.yaml b/environments/neutron-opencontrail.yaml index 4704dbc8..c9bd98bb 100644 --- a/environments/neutron-opencontrail.yaml +++ b/environments/neutron-opencontrail.yaml @@ -7,7 +7,7 @@ resource_registry: parameter_defaults: NeutronCorePlugin: neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2 NeutronServicePlugins: neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin - NeutronEnableDHCPAgent: false + OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None NeutronEnableL3Agent: false NeutronEnableMetadataAgent: false NeutronEnableOVSAgent: false |