Merge "Skip test_attach_scsi_disk_with_config_drive when barbican integration enabled" into mcp/caracal