summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevananda van der Veen <devananda.vdv@gmail.com>2013-03-20 09:19:44 -0700
committerDevananda van der Veen <devananda.vdv@gmail.com>2013-03-20 09:48:55 -0700
commit3aa80834e6aab2456f0f5229a63c2dcef007cb36 (patch)
tree0df40c32bc27a1c3d10aea29ce6582882b460302
parentdef5fa1e0e1c0426d973e4d8e3935c6eb18698dc (diff)
Change type of ssh_port option from Str to Int
The type of CONF option virtual_power_ssh_port was incorrectly defaulted to Str. This can cause Paramiko to raise when casting to %d. Fixes bug 1157824. Change-Id: I30ddd1ff0da45f8392085249f1bd2a539b201a7e
-rw-r--r--nova/virt/baremetal/virtual_power_driver.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/baremetal/virtual_power_driver.py b/nova/virt/baremetal/virtual_power_driver.py
index 2313f9808..e4e91240c 100644
--- a/nova/virt/baremetal/virtual_power_driver.py
+++ b/nova/virt/baremetal/virtual_power_driver.py
@@ -31,8 +31,8 @@ opts = [
cfg.StrOpt('virtual_power_ssh_host',
default='',
help='ip or name to virtual power host'),
- cfg.StrOpt('virtual_power_ssh_port',
- default='22',
+ cfg.IntOpt('virtual_power_ssh_port',
+ default=22,
help='Port to use for ssh to virtual power host'),
cfg.StrOpt('virtual_power_type',
default='virsh',