← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ironic/vivid-updates

« back to all changes in this revision

Viewing changes to ironic/drivers/modules/ilo/power.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2015-01-05 12:21:37 UTC
  • mfrom: (1.2.4)
  • Revision ID: package-import@ubuntu.com-20150105122137-171bqrdpcxqipunk
Tags: 2015.1~b1-0ubuntu1
* New upstream beta release:
  - d/control: Align version requirements with upstream release.
* d/watch: Update uversionmangle to deal with kilo beta versioning
  changes.
* d/control: Bumped Standards-Version to 3.9.6, no changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ironic/drivers/modules/ilo/power.py
19
19
from oslo.config import cfg
20
20
from oslo.utils import importutils
21
21
 
 
22
from ironic.common import boot_devices
22
23
from ironic.common import exception
23
24
from ironic.common.i18n import _
24
25
from ironic.common.i18n import _LE
25
26
from ironic.common import states
26
27
from ironic.conductor import task_manager
 
28
from ironic.conductor import utils as manager_utils
27
29
from ironic.drivers import base
28
30
from ironic.drivers.modules.ilo import common as ilo_common
29
31
from ironic.openstack.common import log as logging
61
63
 
62
64
    if 'ilo_boot_iso' in i_info:
63
65
        ilo_common.setup_vmedia_for_boot(task, i_info['ilo_boot_iso'])
64
 
        ilo_common.set_boot_device(task.node, 'CDROM')
 
66
        manager_utils.node_set_boot_device(task, boot_devices.CDROM)
65
67
 
66
68
 
67
69
def _get_power_state(node):