Make the cluster_role an optional attribute

If the cluster role isn't set just do a search that doesn't use that
constraint.