keystone.conf is revived.
Merge branch 'hpc-grizzly' of ssh://github.com/usc-isi/nova into hpc-grizzly