Keystone variables needed for api-metadata too

Change-Id: I3105ca5094872175436b469958b077f34f0f0cd6