Comment 9 for bug 1436704

By all means @sean-perry as I have limited bandwidth for this right now. The patch set I submitted is functional but it has been suggested that I re-write to implement a builder for the catalogs, which makes sense. It's also dependent on another patch but you might like to take a look:
https://review.openstack.org/#/c/176383/