From 3aa80834e6aab2456f0f5229a63c2dcef007cb36 Mon Sep 17 00:00:00 2001 From: Devananda van der Veen Date: Wed, 20 Mar 2013 09:19:44 -0700 Subject: 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 --- nova/virt/baremetal/virtual_power_driver.py | 4 ++-- 1 file 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', -- cgit