diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-15 05:22:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-15 05:22:04 +0000 |
| commit | 4bd42ea849e6d50d16610377b5e89504f5a4f412 (patch) | |
| tree | 61c380b4b083b4e809facd15b2295a96956c94ef /puppet/controller.yaml | |
| parent | 07586ca090cf2e8257aec654709e76b3177e8572 (diff) | |
| parent | 5f21481962a1d5d41a9ef1735d24277eba6872c5 (diff) | |
Merge "Drop extraconfig for neutron-plumgrid.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 5bdfaec9..70989ccf 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -823,7 +823,6 @@ resources: - neutron_nuage_data # Optionally provided by ControllerExtraConfigPre - midonet_data #Optionally provided by AllNodesExtraConfig - neutron_opencontrail_data # Optionally provided by ControllerExtraConfigPre - - neutron_plumgrid_data # Optionally provided by ControllerExtraConfigPre merge_behavior: deeper datafiles: service_configs: |