summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2011-07-23 16:55:25 +0900
committerIsaku Yamahata <yamahata@valinux.co.jp>2011-07-23 16:55:25 +0900
commit1f55e116adbf00a0a5bd990f99a680e9d6b1618e (patch)
treed476bd802604d7addc997d350c361454bce0d3ea /nova/compute
parent1a18ea6d738b513e03e3f0eddfb9f01dff9addca (diff)
ec2utils: factor generic helper function into generic place
This patch moves out a helper function, properties_root_device_name(), into generic file nova/block_device.py.
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 9994e5724..43a95aa17 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -22,6 +22,7 @@ import eventlet
import re
import time
+from nova import block_device
from nova import db
from nova import exception
from nova import flags
@@ -218,7 +219,7 @@ class API(base.Base):
if reservation_id is None:
reservation_id = utils.generate_uid('r')
- root_device_name = ec2utils.properties_root_device_name(
+ root_device_name = block_device.properties_root_device_name(
image['properties'])
base_options = {