diff options
author | Dmitry Tantsur <divius.inside@gmail.com> | 2016-07-13 13:12:27 +0200 |
---|---|---|
committer | Dmitry Tantsur <divius.inside@gmail.com> | 2016-08-11 17:39:09 +0200 |
commit | 71dc47ef66c433cb90912cf96a4e8df7e3b04117 (patch) | |
tree | 42e59fe99625c516779b373d9a8c41254fc78334 /puppet/services/ironic-conductor.yaml | |
parent | 05691d25087e83066fbf5caadd022dca4c7131f2 (diff) |
Update Ironic composable services
* Add service for configuring Nova compute with Ironic
* Fix authentication in Ironic APU
* Provide a separate environment file for enabling Ironic
Change-Id: I211e6d91eacd238b04a1aa37528d5a91523407d9
Partially-Implements: blueprint ironic-integration
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} |