Rather than list the hostnames individually, use the inventory group. Change-Id: I554fb33f26c31df5f97ffd5be61f6d3e17faefa5
Remove some old ones which were in the wrong place and out of date. Change-Id: I4303e66edc7d3dc00c455a0990b0b3be0f5f91a6 Depends-On: https://review.openstack.org/586699