Merge "Move nova-scheduler data into puppet_config"