Merge "Clarify horizon allowed hosts setting"

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

diff --git a/puppet/services/nova-scheduler.yaml b/puppet/services/nova-scheduler.yaml
index c8f2591..d89e3e1 100644 (file)
--- a/puppet/services/nova-scheduler.yaml
+++ b/puppet/services/nova-scheduler.yaml
@@ -29,6 +29,14 @@ parameters:
       An array of filters used by Nova to filter a node.These filters will be
       applied in the order they are listed, so place your most restrictive
       filters first to make the filtering process more efficient.
       An array of filters used by Nova to filter a node.These filters will be
       applied in the order they are listed, so place your most restrictive
       filters first to make the filtering process more efficient.

+  MonitoringSubscriptionNovaScheduler:
+    default: 'overcloud-nova-scheduler'
+    type: string
+  NovaSchedulerLoggingSource:
+    type: json
+    default:
+      tag: openstack.nova.scheduler
+      path: /var/log/nova/nova-scheduler.log

 
 resources:
   NovaBase:
 
 resources:
   NovaBase:


@@ -43,6 +51,10 @@ outputs:
     description: Role data for the Nova Scheduler service.
     value:
       service_name: nova_scheduler
     description: Role data for the Nova Scheduler service.
     value:
       service_name: nova_scheduler

+      monitoring_subscription: {get_param: MonitoringSubscriptionNovaScheduler}
+      logging_source: {get_param: NovaSchedulerLoggingSource}
+      logging_groups:
+        - nova

       config_settings:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]
       config_settings:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]