Merge "Pass cinder_iscsi_address without brackets"

[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 4187b72..c8f2591 100644 (file)
--- a/puppet/services/nova-scheduler.yaml
+++ b/puppet/services/nova-scheduler.yaml
@@ -4,26 +4,50 @@ description: >
   OpenStack Nova Scheduler service configured with Puppet
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 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
                  via parameter_defaults in the resource registry.
     type: json
+  NovaSchedulerAvailableFilters:
+    default: []
+    description: List of scheduler available filters
+    type: comma_delimited_list
+  NovaSchedulerDefaultFilters:
+    type: comma_delimited_list
+    default: []
+    description: >
+      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.
 
 resources:
   NovaBase:
     type: ./nova-base.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Nova Scheduler service.
     value:
-      service_name: nova-scheduler
+      service_name: nova_scheduler
       config_settings:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]
           - nova::scheduler::filter::ram_allocation_ratio: '1.0'
+            nova::scheduler::filter::scheduler_available_filters: {get_param: NovaSchedulerAvailableFilters}
+            nova::scheduler::filter::scheduler_default_filters: {get_param: NovaSchedulerDefaultFilters}
       step_config: |
         include tripleo::profile::base::nova::scheduler