Merge pull request #94 from willkelly/defaultaz

Merged automatically by jenkins after successful build test

attributes/default.rb

@@ -88,6 +88,7 @@ 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"
+default["nova"]["config"]["default_schedule_zone"] = "nova"
 default["nova"]["config"]["force_raw_images"] = false
 # FIXME: OMG!
 default["nova"]["libvirt"]["ssh"]["private_key"] = "-----BEGIN DSA PRIVATE KEY-----

recipes/nova-common.rb

@@ -79,6 +79,7 @@ template "/etc/nova/nova.conf" do
     "scheduler_driver" => node["nova"]["scheduler"]["scheduler_driver"],
     "scheduler_default_filters" => node["nova"]["scheduler"]["default_filters"].join(","),
     "availability_zone" => node["nova"]["config"]["availability_zone"],
+    "default_schedule_zone" => node["nova"]["config"]["default_schedule_zone"],        
     "virt_type" => node["nova"]["libvirt"]["virt_type"],
     "fixed_range" => node["nova"]["network"]["fixed_range"],
     "force_raw_images" => node["nova"]["config"]["force_raw_images"].to_s,

templates/default/nova.conf.erb

@@ -24,7 +24,7 @@ rabbit_host=<%= @rabbit_ipaddress %>
 scheduler_driver=<%= @scheduler_driver %>
 scheduler_default_filters=<%= @scheduler_default_filters %>
 node_availability_zone=<%= @availability_zone %>
-default_schedule_zone=nova
+default_schedule_zone=<%= @default_schedule_zone %>
 
 # NETWORK
 network_manager=<%= @network_manager %>