Move all openstack:compute and openstack:control parameters in to the node classes so that individual config settings can be easily overwritten in site.pp