Adapt server lists to be more easily used by salt-cloud
Merge pull request #8041 from techhat/nova

Adapt server lists to be more easily used by salt-cloud