Merge "Availability monitoring agents support"

[apex-tripleo-heat-templates.git] / puppet / services / nova-libvirt.yaml

diff --git a/puppet/services/nova-libvirt.yaml b/puppet/services/nova-libvirt.yaml
index a47d249..b5ca243 100644 (file)
--- a/puppet/services/nova-libvirt.yaml
+++ b/puppet/services/nova-libvirt.yaml
@@ -10,6 +10,9 @@ parameters:
                  via parameter_defaults in the resource registry.  This
                  mapping overrides those in ServiceNetMapDefaults.
     type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -18,12 +21,16 @@ parameters:
   NovaComputeLibvirtType:
     type: string
     default: kvm
+  MonitoringSubscriptionNovaLibvirt:
+    default: 'overcloud-nova-libvirt'
+    type: string
 
 resources:
   NovaBase:
     type: ./nova-base.yaml
     properties:
       ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
@@ -31,6 +38,7 @@ outputs:
     description: Role data for the Libvirt service.
     value:
       service_name: nova_libvirt
+      monitoring_subscription: {get_param: MonitoringSubscriptionNovaLibvirt}
       config_settings:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]