diff options
| author | Philip Hands <phil@hands.com> | 2016-06-16 20:42:25 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-06-16 22:33:03 +0200 |
| commit | 27c697a62d3e180f81751b854d1f8d573f5260e8 (patch) | |
| tree | 36bcea0973ca00c182e14581cf66fe14664f8a59 | |
| parent | 7f32d9d2b558269d3090d10cce24bdf42a12257b (diff) | |
| download | jenkins.debian.net-27c697a62d3e180f81751b854d1f8d573f5260e8.tar.xz | |
lvc: name the storage after the VM, to avoid conflicts
perhaps it would be better to prefix volume names in a common pool
so we could try that at some point
Signed-off-by: Holger Levsen <holger@layer-acht.org>
| -rw-r--r-- | cucumber/features/domains/storage_pool.xml | 2 | ||||
| -rw-r--r-- | cucumber/features/support/helpers/storage_helper.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cucumber/features/domains/storage_pool.xml b/cucumber/features/domains/storage_pool.xml index ce0a6915..1e0d6bb3 100644 --- a/cucumber/features/domains/storage_pool.xml +++ b/cucumber/features/domains/storage_pool.xml @@ -1,5 +1,5 @@ <pool type="dir"> - <name>DebianToasterStorage</name> + <name></name> <target> <path></path> </target> diff --git a/cucumber/features/support/helpers/storage_helper.rb b/cucumber/features/support/helpers/storage_helper.rb index 21537a92..b1f316c6 100644 --- a/cucumber/features/support/helpers/storage_helper.rb +++ b/cucumber/features/support/helpers/storage_helper.rb @@ -17,7 +17,8 @@ class VMStorage @virt = virt @xml_path = xml_path pool_xml = REXML::Document.new(File.read("#{@xml_path}/storage_pool.xml")) - pool_name = pool_xml.elements['pool/name'].text + pool_name = LIBVIRT_DOMAIN_NAME + pool_xml.elements['pool/name'].text = pool_name @pool_path = "#{$config["TMPDIR"]}/#{pool_name}" begin @pool = @virt.lookup_storage_pool_by_name(pool_name) |