Merge "Fix wrong ip for keystone service on analytic nodes"