Use different filenames for normal/ironic ramdisks

This avoids a nasty failure mode when using cached images and
switching between nova-bm and Ironic.

Change-Id: I3b8f0cb6af0ed70ed81338575b93f758cac38535
Merge "Use different filenames for normal/ironic ramdisks"