Browse code

Use configure_auth_token_middleware for neutron

auch configuration in the nova section in neutron.conf was
still setup manually. Just reuse the function
configure_auth_token_middleware() for configuration to simplify
the code.

Change-Id: Ib5a7e9212e2d1242bdbec75cf3fac13d5c42a2e2

Thomas Bechtold authored on 2016/03/27 15:59:42
Showing 1 changed files
... ...
@@ -1189,14 +1189,7 @@ function _configure_neutron_service {
1189 1189
     iniset $NEUTRON_CONF DEFAULT notify_nova_on_port_status_changes $Q_NOTIFY_NOVA_PORT_STATUS_CHANGES
1190 1190
     iniset $NEUTRON_CONF DEFAULT notify_nova_on_port_data_changes $Q_NOTIFY_NOVA_PORT_DATA_CHANGES
1191 1191
 
1192
-    iniset $NEUTRON_CONF nova auth_type password
1193
-    iniset $NEUTRON_CONF nova auth_url $KEYSTONE_AUTH_URI
1194
-    iniset $NEUTRON_CONF nova username nova
1195
-    iniset $NEUTRON_CONF nova password $SERVICE_PASSWORD
1196
-    iniset $NEUTRON_CONF nova user_domain_id default
1197
-    iniset $NEUTRON_CONF nova project_name $SERVICE_PROJECT_NAME
1198
-    iniset $NEUTRON_CONF nova project_domain_id default
1199
-    iniset $NEUTRON_CONF nova region_name $REGION_NAME
1192
+    configure_auth_token_middleware $NEUTRON_CONF nova $NEUTRON_AUTH_CACHE_DIR nova
1200 1193
 
1201 1194
     # Configure plugin
1202 1195
     neutron_plugin_configure_service