I was able to get this building using the patch above, and by removing a deprecated import (See upstream: https://github.com/ganeti/ganeti/commit/2844c7c0d0f1493c9fd79cb05e5445d6d1d4687d)

Best,

Reed