Modify nova role to better support labs uses.

Change-Id: I443bd487551ed1d17ce98643f6dc578a973502d3