refactor to actually support 2 images fix2 after review
refactor to actually support 2 images fix2 after review

sshnaidm/openstack-sqe,CiscoSystems/os-sqe,sshnaidm/openstack-sqe,CiscoSystems/os-sqe,CiscoSystems/os-sqe