Remove flavor for os_only cluster

Change-Id: Ifa23cc8b7d2420d4df9b706887f316e4a1cba8ea
Merge "Remove flavor for os_only cluster"