bfcba45c7c
This reverts commit e88a3a6f72f0aad27abf5138a37ff363d0cb3829. Given that most roles aren't yet instrumented to use service_token_roles we have removed the setting in the os_nova role, so this override is no longer necessary. Change-Id: Ib3e22000fe1d641671b759172c892c1928db6a4d Depends-On: https://review.openstack.org/581625