Fix CI

This should get us past some failing CI runs.
Merge pull request #270 from craigtracey/cinderendpoint

Fix CI