Updated to include nova.conf and cinder.conf settings