Fix scoping issues with site variables breaking deployment

fix scoping issues with site.pp and cluster_ha and cluster_simple that cause failed deployments.