diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-17 11:08:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-17 11:08:15 +0000 |
| commit | 0b2829480a299dcba6d5471a99ed76fb92ca31a6 (patch) | |
| tree | 79b5c86adf57aca8025bcc325f7c4d070b5a1718 /puppet/services/ironic-conductor.yaml | |
| parent | 5c609f7c78bee71985120cd15ffbe2d6f2d548a4 (diff) | |
| parent | 71dc47ef66c433cb90912cf96a4e8df7e3b04117 (diff) | |
Merge "Update Ironic composable services"
Diffstat (limited to 'puppet/services/ironic-conductor.yaml')
| -rw-r--r-- | puppet/services/ironic-conductor.yaml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml index a3bce305..01325333 100644 --- a/puppet/services/ironic-conductor.yaml +++ b/puppet/services/ironic-conductor.yaml @@ -28,7 +28,10 @@ outputs: 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} |