diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-23 03:57:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-23 03:57:57 +0000 |
| commit | f32de519adb072ee5ca38b01044f983ac4437444 (patch) | |
| tree | 0876385e8a25e2b4643baa4319cc79049bcb4293 /puppet/controller.yaml | |
| parent | 4ef338574b1a7cef8b1b884d439556b24fb09718 (diff) | |
| parent | 29e04f6dde2ba04edb1861262694fe60fc794362 (diff) | |
Merge "Drop extraconfig for neutron-nuage.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 22b773c1..6bd3be89 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -824,7 +824,6 @@ resources: - neutron_bigswitch_data # Optionally provided by ControllerExtraConfigPre - neutron_cisco_data # Optionally provided by ControllerExtraConfigPre - cisco_n1kv_data # Optionally provided by ControllerExtraConfigPre - - neutron_nuage_data # Optionally provided by ControllerExtraConfigPre - midonet_data #Optionally provided by AllNodesExtraConfig - neutron_opencontrail_data # Optionally provided by ControllerExtraConfigPre merge_behavior: deeper |