Attempting to fix Berksfile and metadata.rb deps

Still changing glance -> openstack-image and Keystone
-> openstack-identity in places now that those cookbooks
have properly been renamed in the stackforge repos.

Change-Id: I9d4a5062e21597424d1a08ac247b8707fb6d98ff