(WIP) Move keystone interaction to phase two

In the first phase of resource collection
keystone might not be running yet.