Move duplicated glance roles into a common file.

This change reduces some duplication, and ensures that glance is using the right repo_packages variable file.