Fix typo

Apparently unused, otherwise it would have never worked
Merge pull request #37 from dirkmueller/release/roxy/master

Fix typo
Fix to work when keystone is behind haproxy
Use new helpers to get hostnames for endpoints
Moved role constraints into model and removed edit deployment

(cherry picked from commit bdf3e3bed88227fe74fb1f046e572a0a1c3487a6)
Merge pull request #42 from vuntz/release/roxy/master

Moved role constraints into model and removed edit deployment
Removed the single assignment block from constraints
Merge pull request #43 from tboerger/feature/roxy/fix-constraints

Removed the single assignment block from constraints
Merge pull request #39 from vuntz/haproxy

Work with keystone behind haproxy
Merge branch 'release/roxy/master' into roxy-sync

Conflicts:
	chef/cookbooks/heat/attributes/default.rb
	chef/cookbooks/heat/recipes/server.rb
	chef/cookbooks/heat/templates/default/api-paste.ini.erb
Merge pull request #45 from vuntz/roxy-sync

Merge roxy branch into stoney