summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJustin Santa Barbara <justinsb@justinsb-desktop>2010-07-30 13:35:21 -0700
committerJustin Santa Barbara <justinsb@justinsb-desktop>2010-07-30 13:35:21 -0700
commit7985f5fb32432630b3fef775f601900f89346ed2 (patch)
treecf8c873b78633dfa47c5ca1327f25e524089bbe6 /nova
parent6526f21d9bf5a53546240ec29099d68933165500 (diff)
Accept a configurable libvirt_uri
Diffstat (limited to 'nova')
-rw-r--r--nova/virt/libvirt_conn.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 6bc5ebf89..8d473296a 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -49,6 +49,9 @@ FLAGS = flags.FLAGS
flags.DEFINE_string('libvirt_xml_template',
utils.abspath('compute/libvirt.xml.template'),
'Libvirt XML Template')
+flags.DEFINE_string('libvirt_uri',
+ 'qemu:///system',
+ 'Libvirt URI to connect to')
def get_connection(read_only):
# These are loaded late so that there's no need to install these
@@ -67,10 +70,11 @@ class LibvirtConnection(object):
auth = [[libvirt.VIR_CRED_AUTHNAME, libvirt.VIR_CRED_NOECHOPROMPT],
'root',
None]
+ libvirt_uri = str(FLAGS.libvirt_uri)
if read_only:
- self._conn = libvirt.openReadOnly('qemu:///system')
+ self._conn = libvirt.openReadOnly(libvirt_uri)
else:
- self._conn = libvirt.openAuth('qemu:///system', auth, 0)
+ self._conn = libvirt.openAuth(libvirt_uri, auth, 0)
def list_instances(self):