keystone keyword argument fix and cluster resources reorder