Support extra options on compute nodes

Change-Id: Ie8aeb61694ca6d8776dd684650664c5a42d1fa09