Browse code
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
Gary Kotton authored on 2014/06/18 15:24:53Showing 1 changed files
| ... | ... |
@@ -302,13 +302,13 @@ function configure_neutron {
|
| 302 | 302 |
|
| 303 | 303 |
function create_nova_conf_neutron {
|
| 304 | 304 |
iniset $NOVA_CONF DEFAULT network_api_class "nova.network.neutronv2.api.API" |
| 305 |
- iniset $NOVA_CONF DEFAULT neutron_admin_username "$Q_ADMIN_USERNAME" |
|
| 306 |
- iniset $NOVA_CONF DEFAULT neutron_admin_password "$SERVICE_PASSWORD" |
|
| 307 |
- iniset $NOVA_CONF DEFAULT neutron_admin_auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v2.0" |
|
| 308 |
- iniset $NOVA_CONF DEFAULT neutron_auth_strategy "$Q_AUTH_STRATEGY" |
|
| 309 |
- iniset $NOVA_CONF DEFAULT neutron_admin_tenant_name "$SERVICE_TENANT_NAME" |
|
| 310 |
- iniset $NOVA_CONF DEFAULT neutron_region_name "RegionOne" |
|
| 311 |
- iniset $NOVA_CONF DEFAULT neutron_url "http://$Q_HOST:$Q_PORT" |
|
| 305 |
+ iniset $NOVA_CONF neutron admin_username "$Q_ADMIN_USERNAME" |
|
| 306 |
+ iniset $NOVA_CONF neutron admin_password "$SERVICE_PASSWORD" |
|
| 307 |
+ iniset $NOVA_CONF neutron admin_auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v2.0" |
|
| 308 |
+ iniset $NOVA_CONF neutron auth_strategy "$Q_AUTH_STRATEGY" |
|
| 309 |
+ iniset $NOVA_CONF neutron admin_tenant_name "$SERVICE_TENANT_NAME" |
|
| 310 |
+ iniset $NOVA_CONF neutron region_name "RegionOne" |
|
| 311 |
+ iniset $NOVA_CONF neutron url "http://$Q_HOST:$Q_PORT" |
|
| 312 | 312 |
|
| 313 | 313 |
if [[ "$Q_USE_SECGROUP" == "True" ]]; then |
| 314 | 314 |
LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver |