diff --git a/attributes/default.rb b/attributes/default.rb
index 2a31b573..664353e6 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -45,6 +45,7 @@ default["nova"]["services"]["volume"]["path"] = "/v1/%(tenant_id)s"
 # can this be wedged into the "api" endpoint?
 default["nova"]["compute"]["region"] = "RegionOne"
 
+# TODO(shep): This should probably be ['nova']['network']['fixed']
 default["nova"]["networks"] = [
         {
                 "label" => "public",
@@ -70,7 +71,9 @@ default["nova"]["networks"] = [
 
 default["nova"]["network"]["fixed_range"] = default["nova"]["networks"][0]["ipv4_cidr"]
 default["nova"]["network"]["dmz_cidr"] = "10.128.0.0/24"
+default["nova"]["network"]["network_manager"] = "nova.network.manager.FlatDHCPManager"
 
+default["nova"]["scheduler"]["scheduler_driver"] = "nova.scheduler.simple.SimpleScheduler"
 default["nova"]["libvirt"]["virt_type"] = "kvm"
 default["nova"]["libvirt"]["vncserver_listen"] = node["ipaddress"]
 default["nova"]["libvirt"]["vncserver_proxyclient_address"] = node["ipaddress"]
diff --git a/recipes/nova-common.rb b/recipes/nova-common.rb
index 6b76e3e4..9d896963 100644
--- a/recipes/nova-common.rb
+++ b/recipes/nova-common.rb
@@ -72,6 +72,8 @@ template "/etc/nova/nova.conf" do
     "glance_api_ipaddress" => glance_endpoint["host"],
     "glance_api_port" => glance_endpoint["port"],
     "iscsi_helper" => platform_options["iscsi_helper"],
+    "network_manager" => node["nova"]["network"]["network_manager"],
+    "scheduler_driver" => node["nova"]["scheduler"]["scheduler_driver"],
     "availability_zone" => node["nova"]["config"]["availability_zone"],
     "virt_type" => node["nova"]["libvirt"]["virt_type"],
     "fixed_range" => node["nova"]["network"]["fixed_range"],
diff --git a/templates/default/nova.conf.erb b/templates/default/nova.conf.erb
index bf1301d1..48c9cc68 100644
--- a/templates/default/nova.conf.erb
+++ b/templates/default/nova.conf.erb
@@ -16,13 +16,13 @@ rabbit_port=5672
 rabbit_host=<%= @rabbit_ipaddress %>
 
 # SCHEDULER
-#--scheduler_manager=nova.scheduler.abstract_scheduler.AbstractScheduler
-scheduler_driver=nova.scheduler.simple.SimpleScheduler
+# scheduler_manager=nova.scheduler.manager.SchedulerManager
+scheduler_driver=<%= @scheduler_driver %>
 node_availability_zone=<%= @availability_zone %>
 default_schedule_zone=nova
 
 # NETWORK
-network_manager=nova.network.manager.FlatDHCPManager
+network_manager=<%= @network_manager %>
 #--flat_interface=eth1
 #--flat_network_dhcp_start=10.20.1.2
 #--public_interface=eth0