WIP keystone config

Change-Id: I1a254815f3408279c9820fae9c68892a1ae764e0