projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel-2.4'
[ganeti-local]
/
lib
/
config.py
diff --git
a/lib/config.py
b/lib/config.py
index
0253a23
..
7d81b37
100644
(file)
--- a/
lib/config.py
+++ b/
lib/config.py
@@
-219,7
+219,7
@@
class ConfigWriter:
if mac in all_macs:
raise errors.ReservationError("mac already in use")
else:
if mac in all_macs:
raise errors.ReservationError("mac already in use")
else:
- self._temporary_macs.Reserve(mac, ec_id)
+ self._temporary_macs.Reserve(ec_id, mac)
@locking.ssynchronized(_config_lock, shared=1)
def ReserveLV(self, lv_name, ec_id):
@locking.ssynchronized(_config_lock, shared=1)
def ReserveLV(self, lv_name, ec_id):
@@
-233,7
+233,7
@@
class ConfigWriter:
if lv_name in all_lvs:
raise errors.ReservationError("LV already in use")
else:
if lv_name in all_lvs:
raise errors.ReservationError("LV already in use")
else:
- self._temporary_lvs.Reserve(lv_name, ec_id)
+ self._temporary_lvs.Reserve(ec_id, lv_name)
@locking.ssynchronized(_config_lock, shared=1)
def GenerateDRBDSecret(self, ec_id):
@locking.ssynchronized(_config_lock, shared=1)
def GenerateDRBDSecret(self, ec_id):