extend crush map and keyring setup

Change-Id: Idcbfbd7833756346694267ad73d08937688058f4
9 files changed