Fixed Keystone endpoint query

The proper service type value is used to get the endpoint from keystone for usage in CLI

Change-Id: I019cb1d3b8b21d8e7a7d2240ccbb6a2f82162b82
Partial-Bug: #1318794