Update HA role mappings

1. add individual mappings for all controllers
2. replace hostname _ with - for consistency