Improve inventory to make deployment targets definable

Change-Id: Ib83479773b8a8024c40c0dac36ded2b0ff2747c4
3 files changed