Browse code
Merge "Neutron: Change auth_plugin to auth_type"
Jenkins authored on 2016/02/19 10:20:27Showing 1 changed files
| ... | ... |
@@ -478,7 +478,7 @@ function configure_neutron {
|
| 478 | 478 |
function create_nova_conf_neutron {
|
| 479 | 479 |
iniset $NOVA_CONF DEFAULT network_api_class "nova.network.neutronv2.api.API" |
| 480 | 480 |
|
| 481 |
- iniset $NOVA_CONF neutron auth_plugin "v3password" |
|
| 481 |
+ iniset $NOVA_CONF neutron auth_type "password" |
|
| 482 | 482 |
iniset $NOVA_CONF neutron auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v3" |
| 483 | 483 |
iniset $NOVA_CONF neutron username "$Q_ADMIN_USERNAME" |
| 484 | 484 |
iniset $NOVA_CONF neutron password "$SERVICE_PASSWORD" |
| ... | ... |
@@ -1160,7 +1160,7 @@ function _configure_neutron_service {
|
| 1160 | 1160 |
iniset $NEUTRON_CONF DEFAULT notify_nova_on_port_status_changes $Q_NOTIFY_NOVA_PORT_STATUS_CHANGES |
| 1161 | 1161 |
iniset $NEUTRON_CONF DEFAULT notify_nova_on_port_data_changes $Q_NOTIFY_NOVA_PORT_DATA_CHANGES |
| 1162 | 1162 |
|
| 1163 |
- iniset $NEUTRON_CONF nova auth_plugin password |
|
| 1163 |
+ iniset $NEUTRON_CONF nova auth_type password |
|
| 1164 | 1164 |
iniset $NEUTRON_CONF nova auth_url $KEYSTONE_AUTH_URI |
| 1165 | 1165 |
iniset $NEUTRON_CONF nova username nova |
| 1166 | 1166 |
iniset $NEUTRON_CONF nova password $SERVICE_PASSWORD |