diff --git a/attributes/default.rb b/attributes/default.rb
index e5da885e..e9a10326 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -69,6 +69,7 @@ default["nova"]["libvirt"]["virt_type"] = "kvm"
 default["nova"]["libvirt"]["vncserver_listen"] = node["ipaddress"]
 default["nova"]["libvirt"]["vncserver_proxyclient_address"] = node["ipaddress"]
 default["nova"]["libvirt"]["auth_tcp"] = "none"
+default["nova"]["config"]["availability_zone"] = "nova"
 
 # FIXME: OMG!
 default["nova"]["libvirt"]["ssh"]["private_key"] = "-----BEGIN DSA PRIVATE KEY-----
diff --git a/recipes/nova-common.rb b/recipes/nova-common.rb
index bcbdc584..6cc85d32 100644
--- a/recipes/nova-common.rb
+++ b/recipes/nova-common.rb
@@ -70,6 +70,7 @@ template "/etc/nova/nova.conf" do
     "glance_api_ipaddress" => glance_endpoint["host"],
     "glance_api_port" => glance_endpoint["port"],
     "iscsi_helper" => platform_options["iscsi_helper"],
+    "availability_zone" => node["nova"]["config"]["availability_zone"],
     "virt_type" => node["nova"]["libvirt"]["virt_type"]
   )
 end
diff --git a/templates/default/nova.conf.erb b/templates/default/nova.conf.erb
index 7c3e43c2..448d3139 100644
--- a/templates/default/nova.conf.erb
+++ b/templates/default/nova.conf.erb
@@ -18,6 +18,8 @@ rabbit_host=<%= @rabbit_ipaddress %>
 # SCHEDULER
 #--scheduler_manager=nova.scheduler.abstract_scheduler.AbstractScheduler
 scheduler_driver=nova.scheduler.simple.SimpleScheduler
+node_availability_zone=<%= @availability_zone %>
+default_schedule_zone=nova
 
 # NETWORK
 network_manager=nova.network.manager.FlatDHCPManager