aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/compute.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-29 15:31:51 +0000
committerGerrit Code Review <review@openstack.org>2016-02-29 15:31:51 +0000
commit6677663e1141c1baabb0769191a7f951abe0c66d (patch)
tree3f51ee76c267a45e80da32328c8e70c3a92ba959 /puppet/compute.yaml
parent1e5e9b172c02bbaa49d3176cfecbe40cccad74f2 (diff)
parentfd922970e86d62d3da7ea5bbde37418fdbcb248e (diff)
Merge "OpenContrail heat templates"
Diffstat (limited to 'puppet/compute.yaml')
-rw-r--r--puppet/compute.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index 3dd0838f..375d5032 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -451,6 +451,7 @@ resources:
- cisco_n1kv_data # Optionally provided by ComputeExtraConfigPre
- nova_nuage_data # Optionally provided by ComputeExtraConfigPre
- midonet_data # Optionally provided by AllNodesExtraConfig
+ - neutron_opencontrail_data # Optionally provided by ComputeExtraConfigPre
datafiles:
compute_extraconfig:
mapped_data: {get_param: NovaComputeExtraConfig}