From 5f21481962a1d5d41a9ef1735d24277eba6872c5 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 8 Jun 2016 16:21:31 -0400 Subject: Drop extraconfig for neutron-plumgrid.yaml This patch drops the extraconfig interface in favor of using the composable services nested stack instead. The benefit is that it is easier to enable multiple services (like network and storage backends at the same time) and all of the plumgrid settings get to live in the same file. Partially-implements: blueprint composable-services-within-roles Change-Id: I1c5827e3650a29f7a0258531f84ae0f50f22343d --- environments/neutron-plumgrid.yaml | 1 - 1 file changed, 1 deletion(-) (limited to 'environments/neutron-plumgrid.yaml') diff --git a/environments/neutron-plumgrid.yaml b/environments/neutron-plumgrid.yaml index 333d44d1..08ace103 100755 --- a/environments/neutron-plumgrid.yaml +++ b/environments/neutron-plumgrid.yaml @@ -1,7 +1,6 @@ # A Heat environment file which can be used to enable PLUMgrid # extensions, configured via puppet resource_registry: - OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-plumgrid.yaml # PLUMgrid doesn't require dhcp, l3, metadata, and ovs agents OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None OS::TripleO::Services::NeutronL3Agent: OS::Heat::None -- cgit 1.2.3-korg