From 13d385e4028c8b770b8cc9f7422c9f64fbd4ec55 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Tue, 17 Jun 2014 23:24:53 -0700 Subject: [PATCH] Neutron: start to use nova's neutron configuration section Commit 5cacad3508570ce70b1f9ef620e0508169687fda added support of a neutron section. This updates the code to make use of that section. Change-Id: I86119476fde5066182d3aadcee5985019202647a --- lib/neutron | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/neutron b/lib/neutron index 6c0ca06b70..a7e1b38223 100644 --- a/lib/neutron +++ b/lib/neutron @@ -302,13 +302,13 @@ function configure_neutron { function create_nova_conf_neutron { 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" + iniset $NOVA_CONF neutron admin_username "$Q_ADMIN_USERNAME" + iniset $NOVA_CONF neutron admin_password "$SERVICE_PASSWORD" + iniset $NOVA_CONF neutron admin_auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v2.0" + iniset $NOVA_CONF neutron auth_strategy "$Q_AUTH_STRATEGY" + iniset $NOVA_CONF neutron admin_tenant_name "$SERVICE_TENANT_NAME" + iniset $NOVA_CONF neutron region_name "RegionOne" + iniset $NOVA_CONF neutron url "http://$Q_HOST:$Q_PORT" if [[ "$Q_USE_SECGROUP" == "True" ]]; then LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver