From f21cc1fd9664575dbc9c31cff1b09ac16fdef985 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Fri, 4 Mar 2016 11:08:32 -0500 Subject: [PATCH] Use new use_neutron variable This uses the new use_neutron variable instead of the crazy class path. This helps us test the use of this in our jobs. Change-Id: Ic6d0cc4b7a0df6b3f5336ee58886f7edff26e846 Depends-On: I1c2eb51d10ba6370492a911f59370b9870646a38 --- lib/neutron-legacy | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/neutron-legacy b/lib/neutron-legacy index 7d6e881881..e06a020f43 100644 --- a/lib/neutron-legacy +++ b/lib/neutron-legacy @@ -486,8 +486,7 @@ function configure_neutron { } function create_nova_conf_neutron { - iniset $NOVA_CONF DEFAULT network_api_class "nova.network.neutronv2.api.API" - + iniset $NOVA_CONF DEFAULT use_neutron True iniset $NOVA_CONF neutron auth_type "password" iniset $NOVA_CONF neutron auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v3" iniset $NOVA_CONF neutron username "$Q_ADMIN_USERNAME" @@ -502,7 +501,6 @@ function create_nova_conf_neutron { if [[ "$Q_USE_SECGROUP" == "True" ]]; then LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER - iniset $NOVA_CONF DEFAULT security_group_api neutron fi # optionally set options in nova_conf