commit 91cd1c630873fe8f3341085faa978f5b3ca72d1c
author Jenkins <jenkins@review.openstack.org> Thu Jul 18 23:19:20 2013 +0000
committer Gerrit Code Review <review@openstack.org> Thu Jul 18 23:19:20 2013 +0000
tree 751c96c3172887548929aff54e7475f8f1f94a19
parent ce66a5f4d51bf8487781853a0ab30c362326868a
parent 50686e56200e7064f5ba65834a03977b6d9ce413

Merge "fix name of scheduler_driver in produced nova.conf"

lib/nova

diff --git a/lib/nova b/lib/nova
index 096f34c..b6b3e08 100644
--- a/lib/nova
+++ b/lib/nova
@@ -424,7 +424,7 @@
     iniset $NOVA_CONF DEFAULT allow_resize_to_same_host "True"
     iniset $NOVA_CONF DEFAULT api_paste_config "$NOVA_API_PASTE_INI"
     iniset $NOVA_CONF DEFAULT rootwrap_config "$NOVA_CONF_DIR/rootwrap.conf"
-    iniset $NOVA_CONF DEFAULT compute_scheduler_driver "$SCHEDULER"
+    iniset $NOVA_CONF DEFAULT scheduler_driver "$SCHEDULER"
     iniset $NOVA_CONF DEFAULT dhcpbridge_flagfile "$NOVA_CONF"
     iniset $NOVA_CONF DEFAULT force_dhcp_release "True"
     iniset $NOVA_CONF DEFAULT fixed_range ""