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

« back to all changes in this revision

Viewing changes to ironic/drivers/ilo.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:
22
22
from ironic.drivers import base
23
23
from ironic.drivers.modules import agent
24
24
from ironic.drivers.modules.ilo import deploy
 
25
from ironic.drivers.modules.ilo import management
25
26
from ironic.drivers.modules.ilo import power
26
27
 
27
28
 
44
45
        self.power = power.IloPower()
45
46
        self.deploy = deploy.IloVirtualMediaIscsiDeploy()
46
47
        self.console = deploy.IloConsoleInterface()
47
 
        self.management = deploy.IloManagement()
 
48
        self.management = management.IloManagement()
48
49
        self.vendor = deploy.VendorPassthru()
49
50
 
50
51
 
67
68
        self.power = power.IloPower()
68
69
        self.deploy = deploy.IloVirtualMediaAgentDeploy()
69
70
        self.console = deploy.IloConsoleInterface()
70
 
        self.management = deploy.IloManagement()
 
71
        self.management = management.IloManagement()
71
72
        self.vendor = agent.AgentVendorInterface()