auth_uri parameter in authtoken was already removed from puppet modules[1],
so remove it from hieradata.
Also, some service templates missed www_authenticate_uri, which was
introduced as a replacement of auth_uri, so add it to make sure that
we have a correct parameter confugured.
[1] I12b4049e4942911c8d1d8027c579eb4c0d1a53eb
Backport note:
- This backport also covers Panko, which is no longer supported since
Ussuri release.
- The follow-up commit e7077e984b which
fixed the incorrect update about s3 token middleware has been
squashed into this commit.
Change-Id: I1e8378f58662377344194916e8bc336df02d0591
(cherry picked from commit 8cc62c5f14)
ad99d7521c