Update auth_file to Upstream

Fixes broken openrc, Some refactoring for different cluster types

Change-Id: Ieba68c76ece5baed65cdcf1d5d508684ed224280
Closes-Bug: 1316376
Merge "Update auth_file to Upstream"