Merge "make keystone authentication variable"