The current example config is broken with the default deferred
authentication of trusts - the project_domain_id and project_name
cannot be specified in this section or keystone will throw a
"cannot be scoped to multiple targets" error when we attempt to get
a token scoped to a trust.
Also, the auth_uri is unused by the keystoneclient password auth
plugins, so remove it (it has been a source of confusion in the
referenced bug).
Change-Id: I6305be3c693993de4d16d82fd6de936e92c437c5
Closes-Bug: #1300246
Backport: liberty
(cherry picked from commit 98ef59a599)
5a3618d4f5