From 1e3c06b98b7e8ecb96c536a2a0b41bf3048fd7df Mon Sep 17 00:00:00 2001 From: "Ing. Jan KRCMAR" Date: Fri, 31 Aug 2018 14:32:51 +0200 Subject: [PATCH 1/3] README.md install debian requires package virtualenv --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4bd26fb..0690f01 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ print(''.join([random.SystemRandom().choice(haystack) for _ in range(50)])) ### Install WebVirtCloud panel (Ubuntu) ```bash -sudo apt-get -y install git python-virtualenv python-dev python-lxml libvirt-dev zlib1g-dev libxslt1-dev nginx supervisor libsasl2-modules gcc pkg-config python-guestfs +sudo apt-get -y install git virtualenv python-virtualenv python-dev python-lxml libvirt-dev zlib1g-dev libxslt1-dev nginx supervisor libsasl2-modules gcc pkg-config python-guestfs git clone https://github.com/retspen/webvirtcloud cd webvirtcloud cp webvirtcloud/settings.py.template webvirtcloud/settings.py From 3b4a1089c30fa8b9246d9fb97f418deffef2815f Mon Sep 17 00:00:00 2001 From: "Ing. Jan KRCMAR" Date: Fri, 31 Aug 2018 15:26:42 +0200 Subject: [PATCH 2/3] README.md add ### Configuring Compute SSH connection --- README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/README.md b/README.md index 0690f01..fdc2975 100644 --- a/README.md +++ b/README.md @@ -219,6 +219,25 @@ login: admin password: admin +### Configuring Compute SSH connection +This is a short example of configuring cloud and compute side of the ssh connection. + +On the webvirtcloud machine you need to generate ssh keys and optionally disable StrictHostKeyChecking. +``` +chown www-data -R ~www-data +sudo -u www-data ssh-keygen +cat > ~www-data/.ssh/config << EOF +Host * +StrictHostKeyChecking no +EOF +chown www-data -R ~www-data/.ssh/config +``` + +You need to put cloud public key into authorized keys on the compute node. Simpliest way of doing this is to use ssh tool from the webvirtcloud server. +``` +sudo -u www-data ssh-copy-id root@compute1 +``` + ### Cloud-init Currently supports only root ssh authorized keys and hostname. Example configuration of the cloud-init client follows. ``` From 6486c201681a356874a3bf7f1e5fc102860166cd Mon Sep 17 00:00:00 2001 From: "Ing. Jan KRCMAR" Date: Tue, 4 Sep 2018 15:40:47 +0200 Subject: [PATCH 3/3] patch for cloning rbd images --- instances/templates/instance.html | 2 ++ vrtManager/instance.py | 27 ++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/instances/templates/instance.html b/instances/templates/instance.html index f42c050..557c3dc 100644 --- a/instances/templates/instance.html +++ b/instances/templates/instance.html @@ -1279,6 +1279,8 @@ image = new_vname + "-" + disk_minus_suffix; } else if (disk_name.lastIndexOf('.') > -1 && disk_dot_suffix.length <= 7) { image = new_vname + "." + disk_dot_suffix + } else if (new_vname != disk_name) { + image = new_vname } else { image = new_vname + '-clone'; } diff --git a/vrtManager/instance.py b/vrtManager/instance.py index ae04b4a..b27baa0 100644 --- a/vrtManager/instance.py +++ b/vrtManager/instance.py @@ -245,7 +245,10 @@ class wvmInstance(wvmConnect): try: dev = disk.xpath('target/@dev')[0] src_fl = disk.xpath('source/@file|source/@dev|source/@name|source/@volume')[0] - disk_format = disk.xpath('driver/@type')[0] + try: + disk_format = disk.xpath('driver/@type')[0] + except: + pass try: vol = self.get_volume_by_path(src_fl) volume = vol.name() @@ -719,6 +722,28 @@ class wvmInstance(wvmConnect): stg = vol.storagePoolLookupByVolume() stg.createXMLFrom(vol_clone_xml, vol, meta_prealloc) + source_protocol = elm.get('protocol') + if source_protocol == 'rbd': + source_name = elm.get('name') + clone_name = "%s/%s" % (os.path.dirname(source_name), target_file) + elm.set('name', clone_name) + + vol = self.get_volume_by_path(source_name) + vol_format = util.get_xml_path(vol.XMLDesc(0), + "/volume/target/format/@type") + + vol_clone_xml = """ + + %s + 0 + 0 + + + + """ % (target_file, vol_format) + stg = vol.storagePoolLookupByVolume() + stg.createXMLFrom(vol_clone_xml, vol, meta_prealloc) + source_dev = elm.get('dev') if source_dev: clone_path = os.path.join(os.path.dirname(source_dev), target_file)