diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-06-10 15:51:51 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-06-16 15:04:25 -0400 |
| commit | e21c7416794f4669f8033f60ccd4ea9bab727022 (patch) | |
| tree | 7ae2e8a4e821507fa30c3da1bc5bf254786f1a47 /environments | |
| parent | 37bb689a0fe37e9365373dbd47291a4323d36bd7 (diff) | |
Drop extraconfig for neutron-opencontrail.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 opencontrail settings get to live in the same file.
Partially-implements: blueprint composable-services-within-roles
Change-Id: I0edbd86a8c981bd6e8a547cd2a6ebed18ecdbb31
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 |