Keystone refactor

Updating based on changes in
rcbops-cookbooks/keystone@e7c6430