Merge "Create entries for overcloud VIPs in /etc/hosts"

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

diff --git a/puppet/services/nova-conductor.yaml b/puppet/services/nova-conductor.yaml
index 39c3541..5dbc7ca 100644 (file)
--- a/puppet/services/nova-conductor.yaml
+++ b/puppet/services/nova-conductor.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
@@ -19,12 +22,16 @@ parameters:
     default: 0
     description: Number of workers for Nova Conductor service.
     type: number
+  MonitoringSubscriptionNovaConductor:
+    default: 'overcloud-nova-conductor'
+    type: string
 
 resources:
   NovaBase:
     type: ./nova-base.yaml
     properties:
       ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
@@ -32,6 +39,7 @@ outputs:
     description: Role data for the Nova Conductor service.
     value:
       service_name: nova_conductor
+      monitoring_subscription: {get_param: MonitoringSubscriptionNovaConductor}
       config_settings:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]