Merge pull request #154 from vuntz/release/roxy/master

Moved role constraints into model and removed edit deployment
Fix to work when keystone is behind haproxy
Use new helpers to get hostnames for endpoints
HAProxy support for cinder-api
Fix case of OpenStack in barclamp description
Use correct glance host when glance is behind haproxy