From 29e04f6dde2ba04edb1861262694fe60fc794362 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 9 Jun 2016 10:37:11 -0400 Subject: Drop extraconfig for neutron-nuage.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 nuage settings get to live in the same file. Partially-implements: blueprint composable-services-within-roles Change-Id: I15fe14e9d6881bc408eb6bb10d9293bd914ef858 --- 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 70989ccf..57d43869 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -820,7 +820,6 @@ resources: - neutron_bigswitch_data # Optionally provided by ControllerExtraConfigPre - neutron_cisco_data # Optionally provided by ControllerExtraConfigPre - cisco_n1kv_data # Optionally provided by ControllerExtraConfigPre - - neutron_nuage_data # Optionally provided by ControllerExtraConfigPre - midonet_data #Optionally provided by AllNodesExtraConfig - neutron_opencontrail_data # Optionally provided by ControllerExtraConfigPre merge_behavior: deeper -- cgit 1.2.3-korg