aboutsummaryrefslogtreecommitdiffstats
path: root/environments/neutron-plumgrid.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-06-08 16:21:31 -0400
committerDan Prince <dprince@redhat.com>2016-06-13 21:57:58 -0400
commit5f21481962a1d5d41a9ef1735d24277eba6872c5 (patch)
treea31845817333c02afe23656e154a59d169eb2b60 /environments/neutron-plumgrid.yaml
parentcf04308ee598b2a6d791c9b4834a746b8b373713 (diff)
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
Diffstat (limited to 'environments/neutron-plumgrid.yaml')
-rwxr-xr-xenvironments/neutron-plumgrid.yaml1
1 files changed, 0 insertions, 1 deletions
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