Merge "Move keystone::db data within service template"

[apex-tripleo-heat-templates.git] / environments / neutron-opencontrail.yaml

diff --git a/environments/neutron-opencontrail.yaml b/environments/neutron-opencontrail.yaml
index 36354bc..340bac7 100644 (file)
--- a/environments/neutron-opencontrail.yaml
+++ b/environments/neutron-opencontrail.yaml
@@ -1,7 +1,6 @@
 # A Heat environment file which can be used to enable OpenContrail
 # extensions, configured via puppet
 resource_registry:
-  OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-opencontrail.yaml
   OS::TripleO::ComputeExtraConfigPre: ../puppet/extraconfig/pre_deploy/compute/neutron-opencontrail.yaml
   OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None