aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'puppet')
-rw-r--r--puppet/compute.yaml1
-rw-r--r--puppet/controller.yaml1
2 files changed, 2 insertions, 0 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index f9b3fc2..ad3a723 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -271,6 +271,7 @@ resources:
- nova_nuage_data # Optionally provided by ComputeExtraConfigPre
- midonet_data # Optionally provided by AllNodesExtraConfig
- neutron_opencontrail_data # Optionally provided by ComputeExtraConfigPre
+ - cisco_aci_data # Optionally provided by ComputeExtraConfigPre
merge_behavior: deeper
datafiles:
service_names:
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 2caa8b1..a8dc5fb 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -501,6 +501,7 @@ resources:
- neutron_cisco_data # Optionally provided by ControllerExtraConfigPre
- cisco_n1kv_data # Optionally provided by ControllerExtraConfigPre
- midonet_data #Optionally provided by AllNodesExtraConfig
+ - cisco_aci_data # Optionally provided by ControllerExtraConfigPre
merge_behavior: deeper
datafiles:
service_names: