Use availability_zone in scheduling

Change-Id: Idf3aa7206784e5a0b7d28dc9624ba2e2de0e9f2d