diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-12-22 07:45:33 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-12-22 07:45:33 +0000 |
commit | a558b1e08dd3f8a0bccb70344586efdd9cbfa0a5 (patch) | |
tree | 0240058394ad349b48aa095672f4b1cc306a875d /puppet/controller.yaml | |
parent | 92c994deb8a3719cf7853f46b0aa0b52489fc368 (diff) | |
parent | de90b568fc39ac0b1c02dc3131cce718adfe8f3a (diff) |
Merge "MidoNet heat templates"
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r-- | puppet/controller.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 8a37cd55..f7c28978 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -1146,6 +1146,7 @@ resources: - 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 datafiles: controller_extraconfig: mapped_data: {get_param: ControllerExtraConfig} |