Move --dry-run option to discover server