From 52b5b8de280717e457e0db464aa62e540461c180 Mon Sep 17 00:00:00 2001
From: Yuriy Zveryanskyy <yzveryanskyy@mirantis.com>
Date: Mon, 19 Oct 2015 12:17:29 +0300
Subject: [PATCH] Fix ironic driver for Liberty release

This patch fixes imports and parameter which has been changed during
Liberty cycle.

Change-Id: Icf1ec866d874c82dedea216241f06a815b0ad6ec
---
 .../ironic_fa_deploy/modules/fuel_agent.py            | 11 +++++------
 contrib/ironic/ironic-fa-deploy/requirements.txt      |  3 +++
 debian/control                                        |  1 +
 specs/fuel-agent.spec                                 |  2 ++
 4 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 contrib/ironic/ironic-fa-deploy/requirements.txt

diff --git a/contrib/ironic/ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py b/contrib/ironic/ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py
index abfe6ab..7aa0d53 100644
--- a/contrib/ironic/ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py
+++ b/contrib/ironic/ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py
@@ -21,7 +21,10 @@ import os
 import tempfile
 
 from oslo_config import cfg
+from oslo_log import log
+from oslo_service import loopingcall
 from oslo_utils import excutils
+from oslo_utils import fileutils
 import six
 
 from ironic.common import boot_devices
@@ -41,9 +44,6 @@ from ironic.conductor import utils as manager_utils
 from ironic.drivers import base
 from ironic.drivers.modules import deploy_utils
 from ironic.drivers.modules import image_cache
-from ironic.openstack.common import fileutils
-from ironic.openstack.common import log
-from ironic.openstack.common import loopingcall
 
 agent_opts = [
     cfg.StrOpt('pxe_config_template',
@@ -149,14 +149,13 @@ def _get_deploy_data(context, image_source):
 
 @image_cache.cleanup(priority=25)
 class AgentTFTPImageCache(image_cache.ImageCache):
-    def __init__(self, image_service=None):
+    def __init__(self):
         super(AgentTFTPImageCache, self).__init__(
             CONF.pxe.tftp_master_path,
             # MiB -> B
             CONF.pxe.image_cache_size * 1024 * 1024,
             # min -> sec
-            CONF.pxe.image_cache_ttl * 60,
-            image_service=image_service)
+            CONF.pxe.image_cache_ttl * 60)
 
 
 def _cache_tftp_images(ctx, node, pxe_info):
diff --git a/contrib/ironic/ironic-fa-deploy/requirements.txt b/contrib/ironic/ironic-fa-deploy/requirements.txt
new file mode 100644
index 0000000..3e8eb62
--- /dev/null
+++ b/contrib/ironic/ironic-fa-deploy/requirements.txt
@@ -0,0 +1,3 @@
+# The driver uses Ironic code base and it's requirements, no additional
+# requirements needed
+ironic>=4.2.0
diff --git a/debian/control b/debian/control
index 2cf6122..0a6f947 100644
--- a/debian/control
+++ b/debian/control
@@ -74,4 +74,5 @@ Description: Ironic bootstrap config files
 Package: ironic-fa-deploy
 Architecture: all
 Section: python
+Depends: ironic-conductor (>= 4.2.0),
 Description: Ironic-fa-deploy package
diff --git a/specs/fuel-agent.spec b/specs/fuel-agent.spec
index 1dc0de8..588de68 100644
--- a/specs/fuel-agent.spec
+++ b/specs/fuel-agent.spec
@@ -67,6 +67,8 @@ Ironic bootstrap config files with Fuel Agent
 Summary:         Ironic Fuel Agent driver
 Group:           Development/Libraries
 
+Requires:    ironic-conductor >= 4.2.0
+
 %description -n  ironic-fa-deploy
 Ironic-fa-deploy package