From: Dmitry Tantsur <divius.inside@gmail.com>
Date: Wed, 31 Aug 2016 09:22:47 +0000 (+0200)
Subject: Ironic: enabled_services moved from ironic to ironic::conductor manifest
X-Git-Tag: opnfv-6.0.0~1652^2~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2bd58de4d5f8955af36a8953c8210c32878f57c9;p=apex-tripleo-heat-templates.git

Ironic: enabled_services moved from ironic to ironic::conductor manifest

Change-Id: I30003e4500ccf681121bca7f0a8ffddb05f61660
Partially-Implements: blueprint ironic-integration
---

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):