Merge pull request #2 from mnederlof/master

Integrate configurable availability zones for cinder