Merge "Decouple EndpointMap from SSL certificate params"

[apex-tripleo-heat-templates.git] / puppet / services / ironic-conductor.yaml

diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml
index 574e5ae..0132533 100644 (file)
--- a/puppet/services/ironic-conductor.yaml
+++ b/puppet/services/ironic-conductor.yaml
@@ -24,11 +24,14 @@ outputs:
   role_data:
     description: Role data for the Ironic conductor role.
     value:
-      service_name: ironic-conductor
+      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}