X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fironic-conductor.yaml;h=9bc86a2c3b2fbcedba688f5ab2e27892fbe23f3d;hb=aae669aa179cf59c9e14859a3ddcc20c26582054;hp=3fb3d9fd2d2aad374a3a3d3662e03399c0adc760;hpb=77e5703b5f0cf687e3a550647347e2697f254b12;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml
index 3fb3d9fd..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,19 +27,24 @@ resources:
   IronicBase:
     type: ./ironic-base.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Ironic conductor role.
     value:
+      service_name: ironic_conductor
       config_settings:
         map_merge:
           - get_attr: [IronicBase, role_data, config_settings]
-          - ironic::enabled_drivers: {get_param: IronicEnabledDrivers}
+          # FIXME: I have no idea why neutron_url is in "api" manifest
+          - ironic::api::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]}
+            ironic::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}
+            ironic::enabled_drivers: {get_param: IronicEnabledDrivers}
             # Prevent tftp_server from defaulting to my_ip setting, which is
             # controller VIP, not a real IP.
             ironic::drivers::pxe::tftp_server: {get_input: ironic_api_network}
-
       step_config: |
         include ::tripleo::profile::base::ironic::conductor