more cloudsource=BetaN fixes, recognize it as 2.0
waitforrebootcompute: fix vmip extraction

nova_fixed network -> fixed network