Comment 1 for bug 1803700

The duplication is an interesting nuance of having to support older clouds which are v2 based, and their upgrade to keystone v3.

Suggested changes to improve scoping of the calls look sensible.