diff options
author | Dan Prince <dprince@redhat.com> | 2016-06-08 16:21:31 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2016-06-13 21:57:58 -0400 |
commit | 5f21481962a1d5d41a9ef1735d24277eba6872c5 (patch) | |
tree | a31845817333c02afe23656e154a59d169eb2b60 /puppet/controller.yaml | |
parent | cf04308ee598b2a6d791c9b4834a746b8b373713 (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 'puppet/controller.yaml')
-rw-r--r-- | puppet/controller.yaml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index cb8c5bc3..61919da0 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -838,7 +838,6 @@ resources: - neutron_nuage_data # Optionally provided by ControllerExtraConfigPre - midonet_data #Optionally provided by AllNodesExtraConfig - neutron_opencontrail_data # Optionally provided by ControllerExtraConfigPre - - neutron_plumgrid_data # Optionally provided by ControllerExtraConfigPre merge_behavior: deeper datafiles: service_configs: |