...
|
...
|
@@ -153,15 +153,7 @@ function configure_neutron_new {
|
153
|
153
|
|
154
|
154
|
iniset $NEUTRON_CONF DEFAULT auth_strategy $NEUTRON_AUTH_STRATEGY
|
155
|
155
|
configure_auth_token_middleware $NEUTRON_CONF neutron $NEUTRON_AUTH_CACHE_DIR keystone_authtoken
|
156
|
|
-
|
157
|
|
- iniset $NEUTRON_CONF nova auth_type password
|
158
|
|
- iniset $NEUTRON_CONF nova auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v3"
|
159
|
|
- iniset $NEUTRON_CONF nova username nova
|
160
|
|
- iniset $NEUTRON_CONF nova password $SERVICE_PASSWORD
|
161
|
|
- iniset $NEUTRON_CONF nova user_domain_id default
|
162
|
|
- iniset $NEUTRON_CONF nova project_name $SERVICE_TENANT_NAME
|
163
|
|
- iniset $NEUTRON_CONF nova project_domain_id default
|
164
|
|
- iniset $NEUTRON_CONF nova region_name $REGION_NAME
|
|
156
|
+ configure_auth_token_middleware $NEUTRON_CONF nova $NEUTRON_AUTH_CACHE_DIR nova
|
165
|
157
|
|
166
|
158
|
# Configure VXLAN
|
167
|
159
|
# TODO(sc68cal) not hardcode?
|
...
|
...
|
@@ -240,10 +232,6 @@ function configure_neutron_new {
|
240
|
240
|
iniset $NEUTRON_CONF DEFAULT bind_port "$NEUTRON_SERVICE_PORT_INT"
|
241
|
241
|
fi
|
242
|
242
|
|
243
|
|
- if is_ssl_enabled_service "nova"; then
|
244
|
|
- iniset $NEUTRON_CONF nova cafile $SSL_BUNDLE_FILE
|
245
|
|
- fi
|
246
|
|
-
|
247
|
243
|
if is_ssl_enabled_service "neutron"; then
|
248
|
244
|
ensure_certificates NEUTRON
|
249
|
245
|
|