aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorDmitry Tantsur <divius.inside@gmail.com>2016-08-31 11:22:47 +0200
committerDmitry Tantsur <divius.inside@gmail.com>2016-09-02 12:02:42 +0200
commit2bd58de4d5f8955af36a8953c8210c32878f57c9 (patch)
tree9175f6e9e516844c540cd6b6c8aec908e035b0a4 /puppet/services
parentd6837ea4a62ec74c4b06901c257fe4d6f4bea73c (diff)
Ironic: enabled_services moved from ironic to ironic::conductor manifest
Change-Id: I30003e4500ccf681121bca7f0a8ffddb05f61660 Partially-Implements: blueprint ironic-integration
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/ironic-conductor.yaml2
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):