From 59e2f29fd1a43bee6a6d59d655c6ba579597f67e Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 8 Apr 2016 14:16:34 -0400 Subject: 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 --- environments/neutron-opencontrail.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'environments/neutron-opencontrail.yaml') diff --git a/environments/neutron-opencontrail.yaml b/environments/neutron-opencontrail.yaml index c9d918f9..0a832f42 100644 --- a/environments/neutron-opencontrail.yaml +++ b/environments/neutron-opencontrail.yaml @@ -4,11 +4,11 @@ resource_registry: OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-opencontrail.yaml OS::TripleO::ComputeExtraConfigPre: ../puppet/extraconfig/pre_deploy/compute/neutron-opencontrail.yaml OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None + OS::TripleO::Services::NeutronL3Agent: OS::Heat::None parameter_defaults: NeutronCorePlugin: neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2 NeutronServicePlugins: neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin - NeutronEnableL3Agent: false NeutronEnableMetadataAgent: false NeutronEnableOVSAgent: false NeutronEnableTunnelling: false -- cgit 1.2.3-korg