From 168bc2f6ff7310db6dc4cf957fdbb121419a3fcf Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 8 Apr 2016 17:09:30 -0400 Subject: composable neutron metadata service Adds new puppet and puppet pacemaker specific services for the Neutron Metadata agent. Partially-implements: blueprint composable-services-within-roles Change-Id: I25f026507e78f18594599b3621613a54f246545d --- environments/neutron-plumgrid.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'environments/neutron-plumgrid.yaml') diff --git a/environments/neutron-plumgrid.yaml b/environments/neutron-plumgrid.yaml index 47a6f291..19f51cfc 100755 --- a/environments/neutron-plumgrid.yaml +++ b/environments/neutron-plumgrid.yaml @@ -2,9 +2,10 @@ # extensions, configured via puppet resource_registry: OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-plumgrid.yaml - # PLUMgrid doesn't require dhcp and l3 agents + # PLUMgrid doesn't require dhcp, l3, and metadata agents OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None OS::TripleO::Services::NeutronL3Agent: OS::Heat::None + OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None parameter_defaults: NeutronCorePlugin: networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2 @@ -25,6 +26,5 @@ parameter_defaults: #PLUMgridNeutronPluginVersion: present #PLUMgridPlumlibVersion: present - # PLUMgrid doesn't require ovs and metadata agents - NeutronEnableMetadataAgent: false + # PLUMgrid doesn't require the ovs agent NeutronEnableOVSAgent: false -- cgit 1.2.3-korg