aboutsummaryrefslogtreecommitdiffstats
path: root/environments/neutron-nuage-config.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-06-09 10:37:11 -0400
committerDan Prince <dprince@redhat.com>2016-06-16 15:04:25 -0400
commit29e04f6dde2ba04edb1861262694fe60fc794362 (patch)
treefdca5312ef8fcccdae58d4340fe6f638749808e1 /environments/neutron-nuage-config.yaml
parent9e502fc07d4520c873cde64dfd01a901cd271274 (diff)
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
Diffstat (limited to 'environments/neutron-nuage-config.yaml')
-rw-r--r--environments/neutron-nuage-config.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/environments/neutron-nuage-config.yaml b/environments/neutron-nuage-config.yaml
index 59f6d34e..28056b35 100644
--- a/environments/neutron-nuage-config.yaml
+++ b/environments/neutron-nuage-config.yaml
@@ -1,7 +1,6 @@
# A Heat environment file which can be used to enable a
# a Neutron Nuage backend on the controller, configured via puppet
resource_registry:
- OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None