diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-23 04:00:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-23 04:00:25 +0000 |
| commit | 1a481a89a359e90baa0accfc6b99c8c34bfd2e1f (patch) | |
| tree | b111e29e52a2ba3000c0e59b7ced2a26c8d0dbca /environments | |
| parent | 23ec8e1509717bb230f77096d3892812f3e67c14 (diff) | |
| parent | e21c7416794f4669f8033f60ccd4ea9bab727022 (diff) | |
Merge "Drop extraconfig for neutron-opencontrail.yaml"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/neutron-opencontrail.yaml | 1 |
1 files changed, 0 insertions, 1 deletions
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 |