Cinder fixes
Add primary controller role
Merge pull request #614 from dmitryilyin/cinder_fixes

Cinder fixes