At the moment, we have a few different "cluster" definitions across the puppet repository:

• monitoring hostgroups, defined in hieradata/common/monitoring.yaml and referenced through the tree
• ganglia (again, monitoring) clusters, which are referenced almost everywhere as "cluster" and reused for e.g. salt
• lvs names (see lvs::configuration)
• conftool-data

We should really do what follows:

• decide which clusters we're really interested in keeping separated
• unify definitions so that we don't have to maintain layers and layers of compatibility
• start removing all the shameful hacks we have around our codebase

Please note that changing the cluster names on conftool will require additional care as we will need to first add them, copy over the data, then change all the references in puppet.