@@ -250,18 +250,18 @@ function configure_neutron() {

 }

 function create_nova_conf_neutron() {

-    iniset $NOVA_CONF DEFAULT network_api_class "nova.network.quantumv2.api.API"

-    iniset $NOVA_CONF DEFAULT quantum_admin_username "$Q_ADMIN_USERNAME"

-    iniset $NOVA_CONF DEFAULT quantum_admin_password "$SERVICE_PASSWORD"

-    iniset $NOVA_CONF DEFAULT quantum_admin_auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v2.0"

-    iniset $NOVA_CONF DEFAULT quantum_auth_strategy "$Q_AUTH_STRATEGY"

-    iniset $NOVA_CONF DEFAULT quantum_admin_tenant_name "$SERVICE_TENANT_NAME"

-    iniset $NOVA_CONF DEFAULT quantum_region_name "RegionOne"

-    iniset $NOVA_CONF DEFAULT quantum_url "http://$Q_HOST:$Q_PORT"

+    iniset $NOVA_CONF DEFAULT network_api_class "nova.network.neutronv2.api.API"

+    iniset $NOVA_CONF DEFAULT neutron_admin_username "$Q_ADMIN_USERNAME"

+    iniset $NOVA_CONF DEFAULT neutron_admin_password "$SERVICE_PASSWORD"

+    iniset $NOVA_CONF DEFAULT neutron_admin_auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v2.0"

+    iniset $NOVA_CONF DEFAULT neutron_auth_strategy "$Q_AUTH_STRATEGY"

+    iniset $NOVA_CONF DEFAULT neutron_admin_tenant_name "$SERVICE_TENANT_NAME"

+    iniset $NOVA_CONF DEFAULT neutron_region_name "RegionOne"

+    iniset $NOVA_CONF DEFAULT neutron_url "http://$Q_HOST:$Q_PORT"

     if [[ "$Q_USE_SECGROUP" == "True" ]]; then

         LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver

-        iniset $NOVA_CONF DEFAULT security_group_api quantum

+        iniset $NOVA_CONF DEFAULT security_group_api neutron

     fi

     # set NOVA_VIF_DRIVER and optionally set options in nova_conf

@@ -270,7 +270,7 @@ function create_nova_conf_neutron() {

     iniset $NOVA_CONF DEFAULT libvirt_vif_driver "$NOVA_VIF_DRIVER"

     iniset $NOVA_CONF DEFAULT linuxnet_interface_driver "$LINUXNET_VIF_DRIVER"

     if is_service_enabled q-meta; then

-        iniset $NOVA_CONF DEFAULT service_quantum_metadata_proxy "True"

+        iniset $NOVA_CONF DEFAULT service_neutron_metadata_proxy "True"

     fi

 }