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 /puppet/controller.yaml | |
| parent | 23ec8e1509717bb230f77096d3892812f3e67c14 (diff) | |
| parent | e21c7416794f4669f8033f60ccd4ea9bab727022 (diff) | |
Merge "Drop extraconfig for neutron-opencontrail.yaml"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 6bd3be89..ae1ef49a 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -825,7 +825,6 @@ resources: - neutron_cisco_data # Optionally provided by ControllerExtraConfigPre - cisco_n1kv_data # Optionally provided by ControllerExtraConfigPre - midonet_data #Optionally provided by AllNodesExtraConfig - - neutron_opencontrail_data # Optionally provided by ControllerExtraConfigPre merge_behavior: deeper datafiles: service_configs: |