Browse code

Merge "XenAPI: Fix deprecated config options"

Jenkins authored on 2014/06/16 21:13:34
Showing 1 changed files
... ...
@@ -49,9 +49,9 @@ function configure_nova_hypervisor {
49 49
     fi
50 50
     read_password XENAPI_PASSWORD "ENTER A PASSWORD TO USE FOR XEN."
51 51
     iniset $NOVA_CONF DEFAULT compute_driver "xenapi.XenAPIDriver"
52
-    iniset $NOVA_CONF DEFAULT xenapi_connection_url "$XENAPI_CONNECTION_URL"
53
-    iniset $NOVA_CONF DEFAULT xenapi_connection_username "$XENAPI_USER"
54
-    iniset $NOVA_CONF DEFAULT xenapi_connection_password "$XENAPI_PASSWORD"
52
+    iniset $NOVA_CONF xenserver connection_url "$XENAPI_CONNECTION_URL"
53
+    iniset $NOVA_CONF xenserver connection_username "$XENAPI_USER"
54
+    iniset $NOVA_CONF xenserver connection_password "$XENAPI_PASSWORD"
55 55
     iniset $NOVA_CONF DEFAULT flat_injected "False"
56 56
     # Need to avoid crash due to new firewall support
57 57
     XEN_FIREWALL_DRIVER=${XEN_FIREWALL_DRIVER:-"nova.virt.firewall.IptablesFirewallDriver"}