Merge "Adding optional aci-opflex hiera data"

[apex-tripleo-heat-templates.git] / puppet / compute.yaml

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index c6dc94d..ad3a723 100644 (file)
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -264,7 +264,6 @@ resources:
             - service_names
             - service_configs
             - compute
-            - ceph_cluster # provided by CephClusterConfig
             - all_nodes # provided by allNodesConfig
             - '"%{::osfamily}"'
             - neutron_bigswitch_data # Optionally provided by ComputeExtraConfigPre
@@ -272,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: