Cherry pick nova metadata HA fix from master

cherr-pick 94570a971679c42f62492e9b96b69118f03936ca