x/bareon
Code Issues Proposed changes

Fix ironic driver for Liberty release

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

Change-Id: Icf1ec866d874c82dedea216241f06a815b0ad6ec
This commit is contained in:
Yuriy Zveryanskyy 2015-10-19 12:17:29 +03:00 committed by Vasyl Saienko
parent 7027b9c31f
commit 52b5b8de28
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/ironic/ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py
View File

@ -21,7 +21,10 @@ import os
import tempfile import tempfile
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log
from oslo_service import loopingcall
from oslo_utils import excutils from oslo_utils import excutils
from oslo_utils import fileutils
import six import six
from ironic.common import boot_devices 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 import base
from ironic.drivers.modules import deploy_utils from ironic.drivers.modules import deploy_utils
from ironic.drivers.modules import image_cache 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 = [ agent_opts = [
cfg.StrOpt('pxe_config_template', cfg.StrOpt('pxe_config_template',
@ -149,14 +149,13 @@ def _get_deploy_data(context, image_source):
@image_cache.cleanup(priority=25) @image_cache.cleanup(priority=25)
class AgentTFTPImageCache(image_cache.ImageCache): class AgentTFTPImageCache(image_cache.ImageCache):
def __init__(self, image_service=None): def __init__(self):
super(AgentTFTPImageCache, self).__init__( super(AgentTFTPImageCache, self).__init__(
CONF.pxe.tftp_master_path, CONF.pxe.tftp_master_path,
# MiB -> B # MiB -> B
CONF.pxe.image_cache_size * 1024 * 1024, CONF.pxe.image_cache_size * 1024 * 1024,
# min -> sec # min -> sec
CONF.pxe.image_cache_ttl * 60, CONF.pxe.image_cache_ttl * 60)
image_service=image_service)
def _cache_tftp_images(ctx, node, pxe_info): def _cache_tftp_images(ctx, node, pxe_info):

3
contrib/ironic/ironic-fa-deploy/requirements.txt Normal file
View File

@ -0,0 +1,3 @@
# The driver uses Ironic code base and it's requirements, no additional
# requirements needed
ironic>=4.2.0

1
debian/control vendored
View File

@ -74,4 +74,5 @@ Description: Ironic bootstrap config files
Package: ironic-fa-deploy Package: ironic-fa-deploy
Architecture: all Architecture: all
Section: python Section: python
Depends: ironic-conductor (>= 4.2.0),
Description: Ironic-fa-deploy package Description: Ironic-fa-deploy package

2
specs/fuel-agent.spec
View File

@ -67,6 +67,8 @@ Ironic bootstrap config files with Fuel Agent
Summary: Ironic Fuel Agent driver Summary: Ironic Fuel Agent driver
Group: Development/Libraries Group: Development/Libraries
Requires: ironic-conductor >= 4.2.0
%description -n ironic-fa-deploy %description -n ironic-fa-deploy
Ironic-fa-deploy package Ironic-fa-deploy package