From a1423f5e74ce167d6ae05552a05faab42b16986f Mon Sep 17 00:00:00 2001
From: Devananda van der Veen <devananda.vdv@gmail.com>
Date: Thu, 5 Dec 2013 08:51:15 -0800
Subject: Import heartbeat_interval opt in API

The API for /v1/drivers needs to read the conductor.heartbeat_timeout
option from ironic.conductor.manager in order to get the list of
active conductor drivers from the database.

Change-Id: If6abd41ac01b3704bbdda0212d07abcaa0339ef9
Closes-bug: 1258207
---
 ironic/api/controllers/v1/driver.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ironic/api/controllers/v1/driver.py b/ironic/api/controllers/v1/driver.py
index 5edf5eeed..2627e863f 100644
--- a/ironic/api/controllers/v1/driver.py
+++ b/ironic/api/controllers/v1/driver.py
@@ -27,6 +27,8 @@ from ironic.openstack.common import log
 from oslo.config import cfg
 
 CONF = cfg.CONF
+CONF.import_opt('heartbeat_timeout', 'ironic.conductor.manager',
+        group='conductor')
 
 LOG = log.getLogger(__name__)
 
-- 
cgit v1.2.1