summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevananda van der Veen <devananda.vdv@gmail.com>2013-12-05 08:51:15 -0800
committerDevananda van der Veen <devananda.vdv@gmail.com>2013-12-05 08:51:15 -0800
commita1423f5e74ce167d6ae05552a05faab42b16986f (patch)
tree7bacbd5c547f7c7f053d8cf0f69a538fee518ec6
parent6c072145bae0757def5142455188fbcfde1e0e30 (diff)
downloadironic-a1423f5e74ce167d6ae05552a05faab42b16986f.tar.gz
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
-rw-r--r--ironic/api/controllers/v1/driver.py2
1 files changed, 2 insertions, 0 deletions
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__)