diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-19 23:06:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-19 23:06:33 +0000 |
| commit | ba9ebc76640743c5e40ebd9891ed74f222698d3e (patch) | |
| tree | e6fbcce28f879f6ba6d7beb70b540cf82fe43441 | |
| parent | 445a53c3454e402f1d4865178e01bffdf2a239e8 (diff) | |
| parent | 7b2b741d0ceb9b297bae4e424f65718fd5a3e692 (diff) | |
Merge "fix incorrectly defined ints as strs"
| -rwxr-xr-x | nova/virt/libvirt/imagebackend.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/volume.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py index 0a84b22e5..ba75ccf8b 100755 --- a/nova/virt/libvirt/imagebackend.py +++ b/nova/virt/libvirt/imagebackend.py @@ -44,7 +44,7 @@ __imagebackend_opts = [ help='Create sparse logical volumes (with virtualsize)' ' if this flag is set to True.'), cfg.IntOpt('libvirt_lvm_snapshot_size', - default='1000', + default=1000, help='The amount of storage (in megabytes) to allocate for LVM' ' snapshot copy-on-write blocks.'), ] diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py index 650292e29..354cd91fe 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume.py @@ -50,7 +50,7 @@ volume_opts = [ default=None, help='Mount options passed to the nfs client. See section ' 'of the nfs man page for details'), - cfg.StrOpt('num_aoe_discover_tries', + cfg.IntOpt('num_aoe_discover_tries', default=3, help='number of times to rediscover AoE target to find volume'), cfg.StrOpt('glusterfs_mount_point_base', |