commit f15f54bdbb3f17db0ec406a6361e845263740505
Merge: f0fd38a b4599d2
Author: Hrvoje Ribicic <[email protected]>
Date: Mon Oct 12 16:01:02 2015 +0200
Merge branch 'stable-2.14' into stable-2.15
* stable-2.14
Add test for tags accounting in hail
Set node tags in iallocator htools backend
* stable-2.13
Improve xl socat migrations
* stable-2.12
QA: Retrieve only the RAPI certificate
QA: Allow usage of specific RAPI certificates and files
QA: Reload certificates only when renew-crypto has been run
QA: Restart Ganeti after adding the RAPI users file
QA: Add reading the RAPI password from a file
QA: Allow the RAPI user to be set
QA: Do not remove nodes from cluster without destroying it
QA: Refactor RAPI handling
Increase default disk size of burnin to 1G
break line with more than 80 characters
Only search for Python-2 interpreters
Fix faulty comments / indentation
Handle Xen 4.3 states better
* stable-2.11
(no changes)
* stable-2.10
Add a test for parsing of admin_state in IAlloc backend
At IAlloc backend guess state from admin state
* stable-2.9
Update harep's man page to notify users of its limitations
Signed-off-by: Hrvoje Ribicic <[email protected]>
diff --cc qa/qa_cluster.py
index b4bf4a6,a4f887e..ac1d3a8
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@@ -32,6 -32,6 +32,7 @@@
"""
++import os
import re
import tempfile
import time
diff --cc test/hs/shelltests/htools-hail.test
index 3ad375a,1a9c175..f0eaca4
--- a/test/hs/shelltests/htools-hail.test
+++ b/test/hs/shelltests/htools-hail.test
@@@ -172,12 -177,7 +177,17 @@@ cat $TESTDATA_DIR/hail-alloc-invalid-ne
>>> /"success":true/
>>>= 0
+# Verify dedicated allocation
+./test/hs/hail $TESTDATA_DIR/hail-alloc-dedicated-1.json
+>>> /"success":true.*"result":\["node2-quarter"\]/
+>>>= 0
+
+# Verify dedicated multi-allocation
+./test/hs/hail $TESTDATA_DIR/hail-multialloc-dedicated.json
+>>> /"success":true.*"result":\[\[\[.*\["node2-quarter"\]/
+>>>= 0
++
+ # Check that hail account location tags
+ ./test/hs/hail $TESTDATA_DIR/hail-alloc-nlocation.json
+ >>> /"success":true,.*,"result":\["node3","node2"\]/
+ >>>= 0
Hrvoje Ribicic
Ganeti Engineering
Google Germany GmbH
Dienerstr. 12, 80331, München
Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind,
leiten Sie diese bitte nicht weiter, informieren Sie den Absender und
löschen Sie die E-Mail und alle Anhänge. Vielen Dank.
This e-mail is confidential. If you are not the right addressee please do
not forward it, please inform the sender, and please erase this e-mail
including any attachments. Thanks.
