This is just another code path for little benefit in devstack which is going to rot out. We should be opinionated here and only support the dynamic catalog. Change-Id: I4e5c7e86aefe72fc21c77d423033e9b169318fec