From e157378decd3a6927dcb62f2d74923c95456ccf5 Mon Sep 17 00:00:00 2001 From: Antoine Millet Date: Tue, 9 Jun 2015 15:15:46 +0200 Subject: [PATCH] Implemented vir_uri tag --- cloudcontrol/node/config.py | 5 +++++ cloudcontrol/node/hypervisor/tags.py | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/cloudcontrol/node/config.py b/cloudcontrol/node/config.py index 4f029f7..125a93d 100644 --- a/cloudcontrol/node/config.py +++ b/cloudcontrol/node/config.py @@ -14,6 +14,7 @@ # along with CloudControl. If not, see . +import socket import logging import logging.config from StringIO import StringIO @@ -103,6 +104,10 @@ class NodeConfigParser(object): self.plugins_store_path = config.get('node', 'plugins_store_path', '/var/lib/cc-node/plugins') + # Libvirt URI to export to cc-server (vir_uri tag) + default_libvirt_uri = 'qemu+tcp://%s/system' % socket.gethostbyname(socket.gethostname()) + self.libvirt_uri = config.get('node', 'libvirt_uri', default_libvirt_uri) + # Path to define script default_define_script = 'hkvm-define' self.define_script = config.get('node', 'define_script', default_define_script) diff --git a/cloudcontrol/node/hypervisor/tags.py b/cloudcontrol/node/hypervisor/tags.py index fb1f420..040824a 100644 --- a/cloudcontrol/node/hypervisor/tags.py +++ b/cloudcontrol/node/hypervisor/tags.py @@ -60,6 +60,10 @@ def vir_status(handl): return {True: 'connected', False: 'disconnected'}[handl.virt_connected] +def vir_uri(handl): + return handl.main.config.libvirt_uri + + # hypervisor related tags def htype(): """Hypervisor type.""" -- GitLab