Merge 2.1 into 2.2 branch

This commit is contained in:
grossmj
2018-03-12 13:38:50 +07:00
parent 2a5f3221b9
commit 658aa4bae9
69 changed files with 846 additions and 448 deletions

View File

@ -533,7 +533,7 @@ class QemuVM(BaseNode):
if not mac_address:
# use the node UUID to generate a random MAC address
self._mac_address = "00:%s:%s:%s:%s:00" % (self.project.id[-4:-2], self.project.id[-2:], self.id[-4:-2], self.id[-2:])
self._mac_address = "52:%s:%s:%s:%s:00" % (self.project.id[-4:-2], self.project.id[-2:], self.id[-4:-2], self.id[-2:])
else:
self._mac_address = mac_address