Merge lp:~berendt/nova/lp725615 into lp:~hudson-openstack/nova/trunk

[Christian Berendt]

introduced new flag "max_nbd_devices" to set the number of possible NBD devices

introduced new flag "max_nbd_devices" to set the number of possible NBD devices

[Rick Harris (rconradharris)]

> Rick-Harriss-MacBook-Pro:nova rick$ grep -R "DEFINE.*max" .
> ./nova/flags.py:DEFINE_integer('rabbit_max_retries', 12, 'rabbit connection attempts')
> ./nova/flags.py:DEFINE_integer('sql_max_retries', 12, 'sql connection attempts')
> ./nova/scheduler/simple.py:flags.DEFINE_integer("max_cores", 16,
> ./nova/scheduler/simple.py:flags.DEFINE_integer("max_gigabytes", 10000,
> ./nova/scheduler/simple.py:flags.DEFINE_integer("max_networks", 1000,
> ./nova/virt/xenapi_conn.py:flags.DEFINE_integer('xenapi_vhd_coalesce_max_attempts',
> Rick-Harriss-MacBook-Pro:nova rick$ grep -R "DEFINE.*maximum*" .

Femto-nit, but 'max'(rather than 'maximum') would be more consistent with our naming scheme for FLAGS. Not sure if this rises to the level of "Needs Fixing", so marking as "Approved".

review: Approve

[Jay Pipes (jaypipes)]

I'd second Rick's comment. Change to max instead of maximum and approved from me.. might as well fix it up here instead of another merge prop.

review: Needs Fixing

[Jay Pipes (jaypipes)]

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'nova/virt/disk.py'
--- nova/virt/disk.py	2011-02-21 15:16:21 +0000
+++ nova/virt/disk.py	2011-02-26 18:20:12 +0000
@@ -40,6 +40,8 @@
                      'block_size to use for dd')
 flags.DEFINE_integer('timeout_nbd', 10,
                      'time to wait for a NBD device coming up')
+flags.DEFINE_integer('max_nbd_devices', 16,
+                     'maximum number of possible nbd devices')
 
 
 def extend(image, size):
@@ -141,7 +143,7 @@
         utils.execute('sudo losetup --detach %s' % device)
 
 
-_DEVICES = ['/dev/nbd%s' % i for i in xrange(16)]
+_DEVICES = ['/dev/nbd%s' % i for i in xrange(FLAGS.max_nbd_devices)]
 
 
 def _allocate_device():