Use discovery fixture

Use the provided fixtures rather than copying code out of
keystoneclient.

Change-Id: I550edc355f008d94d6c0b834494d693137c29111
Merge "Use discovery fixture"