Merge "Add note about ironic config options"