X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fnova-scheduler.yaml;h=78ff008b9bb1635ccff2e15a650a05f5394a8f43;hb=5d13a6397c4dccc78dc13c4bf23d651485868904;hp=4187b728330a30e35a293085795114787795e1d1;hpb=11a27c9a3b4e0969f3a89c2a9485f72317577c12;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/nova-scheduler.yaml b/puppet/services/nova-scheduler.yaml
index 4187b728..78ff008b 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
@@ -14,13 +23,15 @@ 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]