Add DefaultPasswords to composable services

[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 412dd27..0b6169d 100644 (file)
--- a/puppet/services/nova-conductor.yaml
+++ b/puppet/services/nova-conductor.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Nova Conductor 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
@@ -17,11 +26,16 @@ parameters:
 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 Conductor service.
     value:
+      service_name: nova_conductor
       config_settings:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]