summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Krelle <nobodycam@gmail.com>2013-03-12 12:41:12 -0700
committerChris Krelle <nobodycam@gmail.com>2013-03-12 13:26:32 -0700
commite7b6be37ebf16628d9b6a962f255bdf3524ec382 (patch)
tree9fc9855b2cd13196f7879ed8f8d94a0b86e62dc2
parentf0fc1240090938ae9d945bb91bfeda4e5d42ac9c (diff)
downloadnova-e7b6be37ebf16628d9b6a962f255bdf3524ec382.tar.gz
nova-e7b6be37ebf16628d9b6a962f255bdf3524ec382.tar.xz
nova-e7b6be37ebf16628d9b6a962f255bdf3524ec382.zip
Virtual Power Driver list running vms quoting error
This patch corrects a issue with VPD when configured for virsh the list running vms function attempts to execute $2 instead of the actual command. Fixes Bug 1154280 Change-Id: I6d06cc58fb0f2935c4341761908b914106bda916 Authored-by: Chris Krelle <nobodycam@gmail.com>
-rw-r--r--nova/virt/baremetal/virtual_power_driver_settings.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/baremetal/virtual_power_driver_settings.py b/nova/virt/baremetal/virtual_power_driver_settings.py
index cd85bddbc..e0df12242 100644
--- a/nova/virt/baremetal/virtual_power_driver_settings.py
+++ b/nova/virt/baremetal/virtual_power_driver_settings.py
@@ -52,7 +52,7 @@ class virsh(object):
self.reboot_cmd = 'reset {_NodeName_}'
self.list_cmd = "list --all | tail -n +2 | awk -F\" \" '{print $2}'"
self.list_running_cmd = \
- "list --all|grep running|awk -F\" \" '{print \"$2\"}'"
+ "list --all|grep running|awk -v qc='\"' -F\" \" '{print qc$2qc}'"
self.get_node_macs = ("dumpxml {_NodeName_} | grep "
'"mac address" | awk -F'
'"'