Remove token and tenant_name from CLI options. Change-Id: Iaea1e8f7fab60ea25985cc69aa7b5d8b9268ffa0 Closes-Bug:#1708752