X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fironic-conductor.yaml;h=9bc86a2c3b2fbcedba688f5ab2e27892fbe23f3d;hb=6d12839f3655f8774ad227bfa4f3cf4d7b45acc5;hp=01325333fe397a36d71a13ff1b61d10131b8d5f8;hpb=b8d7214c641f86648e8067ff716cb39cd4e5b8ba;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml
index 01325333..9bc86a2c 100644
--- a/puppet/services/ironic-conductor.yaml
+++ b/puppet/services/ironic-conductor.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Ironic conductor 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
@@ -18,6 +27,8 @@ resources:
   IronicBase:
     type: ./ironic-base.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs: