diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-02-29 15:31:51 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-02-29 15:31:51 +0000 |
commit | 6677663e1141c1baabb0769191a7f951abe0c66d (patch) | |
tree | 3f51ee76c267a45e80da32328c8e70c3a92ba959 /puppet/controller.yaml | |
parent | 1e5e9b172c02bbaa49d3176cfecbe40cccad74f2 (diff) | |
parent | fd922970e86d62d3da7ea5bbde37418fdbcb248e (diff) |
Merge "OpenContrail 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 2ee93861..a28ae562 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -1226,6 +1226,7 @@ resources: - 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 datafiles: controller_extraconfig: mapped_data: {get_param: ControllerExtraConfig} |