Swift proxy align *-quotas with puppet-swift syntax

[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 0b6169d..b96bf6e 100644 (file)
--- a/puppet/services/nova-conductor.yaml
+++ b/puppet/services/nova-conductor.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Nova Conductor service configured with Puppet
@@ -22,6 +22,17 @@ parameters:
     default: 0
     description: Number of workers for Nova Conductor service.
     type: number
+  MonitoringSubscriptionNovaConductor:
+    default: 'overcloud-nova-conductor'
+    type: string
+  NovaSchedulerLoggingSource:
+    type: json
+    default:
+      tag: openstack.nova.scheduler
+      path: /var/log/nova/nova-scheduler.log
+
+conditions:
+  nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]}
 
 resources:
   NovaBase:
@@ -36,9 +47,17 @@ outputs:
     description: Role data for the Nova Conductor service.
     value:
       service_name: nova_conductor
+      monitoring_subscription: {get_param: MonitoringSubscriptionNovaConductor}
+      logging_source: {get_param: NovaSchedulerLoggingSource}
+      logging_groups:
+        - nova
       config_settings:
         map_merge:
-          - get_attr: [NovaBase, role_data, config_settings]
+        - get_attr: [NovaBase, role_data, config_settings]
+        -
+          if:
+          - nova_workers_zero
+          - {}
           - nova::conductor::workers: {get_param: NovaWorkers}
       step_config: |
         include tripleo::profile::base::nova::conductor