X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fneutron-opencontrail.yaml;h=340bac78d34268b39bb1ede93e9b842463543f83;hb=53b60a88ccae5a0b8b97b763c83fe7fdf9a7067d;hp=36354bc9ff30a815e9bdfce435e30dfaac25738f;hpb=23ec8e1509717bb230f77096d3892812f3e67c14;p=apex-tripleo-heat-templates.git diff --git a/environments/neutron-opencontrail.yaml b/environments/neutron-opencontrail.yaml index 36354bc9..340bac78 100644 --- 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