Fix node registration

This fixes the inability to properly register and use
a cluster with a name other than default without manual
intervention. This integrates the register-node recipe
with the cluster-controller recipe.