diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-02 16:50:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-02 16:50:38 +0000 |
| commit | 7282a6db92f4904902628cf07854b6f9edd2c2e2 (patch) | |
| tree | 5f06a9360a9f505ff5d6931531ae10b5802cf9ed /puppet | |
| parent | 419557eb25e8cb15396983149971335ba953a3b3 (diff) | |
| parent | 2bd58de4d5f8955af36a8953c8210c32878f57c9 (diff) | |
Merge "Ironic: enabled_services moved from ironic to ironic::conductor manifest"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/ironic-conductor.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml index 97369cdd..8358ff19 100644 --- a/puppet/services/ironic-conductor.yaml +++ b/puppet/services/ironic-conductor.yaml @@ -46,8 +46,8 @@ outputs: # FIXME: I have no idea why neutron_url is in "api" manifest - ironic::api::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]} ironic::conductor::api_url: {get_param: [EndpointMap, IronicInternal, uri_no_suffix]} + ironic::conductor::enabled_drivers: {get_param: IronicEnabledDrivers} ironic::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]} - ironic::enabled_drivers: {get_param: IronicEnabledDrivers} # NOTE: bind IP is found in Heat replacing the network name with the # local node IP for the given network; replacement examples # (eg. for internal_api): |