Move aggregation config into salt states