Keystone refactor

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