Merge "Remove repeated apache-related hieradata"

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

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index dbf2f61..0f9e031 100644 (file)
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -107,6 +107,9 @@ parameters:
   ServiceNames:
     type: comma_delimited_list
     default: []
+  MonitoringSubscriptions:
+    type: comma_delimited_list
+    default: []
   ConfigCommand:
     type: string
     description: Command which will be run whenever configuration data changes
@@ -258,7 +261,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
@@ -266,11 +268,13 @@ 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:
               mapped_data:
                 service_names: {get_param: ServiceNames}
+                sensu::subscriptions: {get_param: MonitoringSubscriptions}
             service_configs:
               mapped_data:
                 map_replace: