Moved role constraints into model and fixed typo

The same as https://github.com/crowbar/barclamp-keystone/pull/186