X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fnova-scheduler.yaml;h=c8f2591d76e5fc5d14d81765af3ca8f68d5266af;hb=685c1e7de0c5a37d6f11eeb9bceaa74b0a2e923a;hp=28612affbd4a9702132064c4718bc60847f2b5e3;hpb=6842f1817e1c7a25fa090098229b2ad06a5d5e89;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/nova-scheduler.yaml b/puppet/services/nova-scheduler.yaml
index 28612aff..c8f2591d 100644
--- a/puppet/services/nova-scheduler.yaml
+++ b/puppet/services/nova-scheduler.yaml
@@ -4,6 +4,15 @@ 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
@@ -13,11 +22,20 @@ parameters:
     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:
@@ -30,5 +48,6 @@ outputs:
           - 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