OpenStack Compute (nova)

Merge lp:~jk0/nova/put-flags-back into lp:~hudson-openstack/nova/trunk

  1. put-flags-back
  2. Merge into trunk
Proposed by Josh Kearney
Status: Merged
Approved by: Eric Day
Approved revision: 467
Merged at revision: 466
Proposed branch: lp:~jk0/nova/put-flags-back
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 26 lines (+3/-1)
1 file modified
nova/virt/xenapi/vm_utils.py (+3/-1)
To merge this branch: bzr merge lp:~jk0/nova/put-flags-back
Reviewer Review Type Date Requested Status
Eric Day (community) Approve
Sandy Walsh (community) Approve
Review via email: mp+43973@code.launchpad.net

Commit message

Put flags back in nova.virt.xenapi/vm_utils.

To post a comment you must log in.
Revision history for this message
Eric Day (eday) wrote :

Blank lines on 8 and 13 should not be there, according to HACKING file.

review: Needs Fixing
Revision history for this message
Sandy Walsh (sandy-walsh) wrote :

lgtm

review: Approve
lp:~jk0/nova/put-flags-back updated
467. By Josh Kearney

Removed unnecessary blank lines

Revision history for this message
Eric Day (eday) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/virt/xenapi/vm_utils.py'
2--- nova/virt/xenapi/vm_utils.py 2010-12-10 19:46:29 +0000
3+++ nova/virt/xenapi/vm_utils.py 2010-12-16 21:21:50 +0000
4@@ -23,6 +23,7 @@
5 import urllib
6 from xml.dom import minidom
7
8+from nova import flags
9 from nova import utils
10 from nova.auth.manager import AuthManager
11 from nova.compute import instance_types
12@@ -30,6 +31,8 @@
13 from nova.virt import images
14
15
16+FLAGS = flags.FLAGS
17+
18 XENAPI_POWER_STATE = {
19 'Halted': power_state.SHUTDOWN,
20 'Running': power_state.RUNNING,
21@@ -37,7 +40,6 @@
22 'Suspended': power_state.SHUTDOWN, # FIXME
23 'Crashed': power_state.CRASHED}
24
25-
26 XenAPI = None
27
28