aboutsummaryrefslogtreecommitdiffstats
path: root/environments/neutron-plumgrid.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-04-08 14:16:34 -0400
committerDan Prince <dprince@redhat.com>2016-05-18 08:25:00 -0400
commit59e2f29fd1a43bee6a6d59d655c6ba579597f67e (patch)
tree74fc4b29c003b4abf11ec154560f8edef7dc0e0f /environments/neutron-plumgrid.yaml
parentd6574fa32a0954aea02684984d9a93c444ec34f0 (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 'environments/neutron-plumgrid.yaml')
-rwxr-xr-xenvironments/neutron-plumgrid.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/environments/neutron-plumgrid.yaml b/environments/neutron-plumgrid.yaml
index 8f17b8b5..47a6f291 100755
--- a/environments/neutron-plumgrid.yaml
+++ b/environments/neutron-plumgrid.yaml
@@ -2,8 +2,9 @@
# extensions, configured via puppet
resource_registry:
OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-plumgrid.yaml
- # PLUMgrid doesn't require dhcp
+ # PLUMgrid doesn't require dhcp and l3 agents
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
+ OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
parameter_defaults:
NeutronCorePlugin: networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2
@@ -24,7 +25,6 @@ parameter_defaults:
#PLUMgridNeutronPluginVersion: present
#PLUMgridPlumlibVersion: present
- # PLUMgrid doesn't require l3, ovs and metadata agents
- NeutronEnableL3Agent: false
+ # PLUMgrid doesn't require ovs and metadata agents
NeutronEnableMetadataAgent: false
NeutronEnableOVSAgent: false