From e21c7416794f4669f8033f60ccd4ea9bab727022 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 10 Jun 2016 15:51:51 -0400 Subject: Drop extraconfig for neutron-opencontrail.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 opencontrail settings get to live in the same file. Partially-implements: blueprint composable-services-within-roles Change-Id: I0edbd86a8c981bd6e8a547cd2a6ebed18ecdbb31 --- puppet/controller.yaml | 1 - 1 file changed, 1 deletion(-) (limited to 'puppet/controller.yaml') diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 57d43869..f12656dd 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -821,7 +821,6 @@ resources: - neutron_cisco_data # Optionally provided by ControllerExtraConfigPre - cisco_n1kv_data # Optionally provided by ControllerExtraConfigPre - midonet_data #Optionally provided by AllNodesExtraConfig - - neutron_opencontrail_data # Optionally provided by ControllerExtraConfigPre merge_behavior: deeper datafiles: service_configs: -- cgit 1.2.3-korg