Update HA role mappings

1. add individual mappings for all controllers
2. replace hostname _ with - for consistency
Merge pull request #152 from bodepd/update_ha_roles

Update HA role mappings