This is just another code path for little benefit in devstack which is
going to rot out. We should be opinionated here and only support the
dynamic catalog.
Change-Id: I4e5c7e86aefe72fc21c77d423033e9b169318fec
... | ... |
@@ -379,24 +379,6 @@ that matches requirements. |
379 | 379 |
|
380 | 380 |
PIP_UPGRADE=True |
381 | 381 |
|
382 |
- |
|
383 |
-Service Catalog Backend |
|
384 |
- |
|
385 |
-By default DevStack uses Keystone's ``sql`` service catalog backend. |
|
386 |
-An alternate ``template`` backend is also available, however, it does |
|
387 |
-not support the ``service-*`` and ``endpoint-*`` commands of the |
|
388 |
-``keystone`` CLI. To do so requires the ``sql`` backend be enabled |
|
389 |
-with ``KEYSTONE_CATALOG_BACKEND``: |
|
390 |
- |
|
391 |
- :: |
|
392 |
- |
|
393 |
- KEYSTONE_CATALOG_BACKEND=template |
|
394 |
- |
|
395 |
-DevStack's default configuration in ``sql`` mode is set in |
|
396 |
-``lib/keystone`` |
|
397 |
- |
|
398 |
- |
|
399 | 382 |
Guest Images |
400 | 383 |
------------ |
401 | 384 |
|
402 | 385 |
deleted file mode 100644 |
... | ... |
@@ -1,63 +0,0 @@ |
1 |
-# config for TemplatedCatalog, using camelCase because I don't want to do |
|
2 |
-# translations for legacy compat |
|
3 |
-catalog.RegionOne.identity.publicURL = http://%SERVICE_HOST%:$(public_port)s/v2.0 |
|
4 |
-catalog.RegionOne.identity.adminURL = http://%SERVICE_HOST%:$(admin_port)s/v2.0 |
|
5 |
-catalog.RegionOne.identity.internalURL = http://%SERVICE_HOST%:$(public_port)s/v2.0 |
|
6 |
-catalog.RegionOne.identity.name = Identity Service |
|
7 |
- |
|
8 |
- |
|
9 |
-catalog.RegionOne.compute.publicURL = http://%SERVICE_HOST%:8774/v2/$(tenant_id)s |
|
10 |
-catalog.RegionOne.compute.adminURL = http://%SERVICE_HOST%:8774/v2/$(tenant_id)s |
|
11 |
-catalog.RegionOne.compute.internalURL = http://%SERVICE_HOST%:8774/v2/$(tenant_id)s |
|
12 |
-catalog.RegionOne.compute.name = Compute Service |
|
13 |
- |
|
14 |
- |
|
15 |
-catalog.RegionOne.computev21.publicURL = http://%SERVICE_HOST%:8774/v2.1/$(tenant_id)s |
|
16 |
-catalog.RegionOne.computev21.adminURL = http://%SERVICE_HOST%:8774/v2.1/$(tenant_id)s |
|
17 |
-catalog.RegionOne.computev21.internalURL = http://%SERVICE_HOST%:8774/v2.1/$(tenant_id)s |
|
18 |
-catalog.RegionOne.computev21.name = Compute Service V2.1 |
|
19 |
- |
|
20 |
- |
|
21 |
-catalog.RegionOne.volume.publicURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s |
|
22 |
-catalog.RegionOne.volume.adminURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s |
|
23 |
-catalog.RegionOne.volume.internalURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s |
|
24 |
-catalog.RegionOne.volume.name = Volume Service |
|
25 |
- |
|
26 |
- |
|
27 |
-catalog.RegionOne.volumev2.publicURL = http://%SERVICE_HOST%:8776/v2/$(tenant_id)s |
|
28 |
-catalog.RegionOne.volumev2.adminURL = http://%SERVICE_HOST%:8776/v2/$(tenant_id)s |
|
29 |
-catalog.RegionOne.volumev2.internalURL = http://%SERVICE_HOST%:8776/v2/$(tenant_id)s |
|
30 |
-catalog.RegionOne.volumev2.name = Volume Service V2 |
|
31 |
- |
|
32 |
- |
|
33 |
-catalog.RegionOne.ec2.publicURL = http://%SERVICE_HOST%:8773/ |
|
34 |
-catalog.RegionOne.ec2.adminURL = http://%SERVICE_HOST%:8773/ |
|
35 |
-catalog.RegionOne.ec2.internalURL = http://%SERVICE_HOST%:8773/ |
|
36 |
-catalog.RegionOne.ec2.name = EC2 Service |
|
37 |
- |
|
38 |
- |
|
39 |
-catalog.RegionOne.s3.publicURL = http://%SERVICE_HOST%:%S3_SERVICE_PORT% |
|
40 |
-catalog.RegionOne.s3.adminURL = http://%SERVICE_HOST%:%S3_SERVICE_PORT% |
|
41 |
-catalog.RegionOne.s3.internalURL = http://%SERVICE_HOST%:%S3_SERVICE_PORT% |
|
42 |
-catalog.RegionOne.s3.name = S3 Service |
|
43 |
- |
|
44 |
- |
|
45 |
-catalog.RegionOne.image.publicURL = http://%SERVICE_HOST%:9292 |
|
46 |
-catalog.RegionOne.image.adminURL = http://%SERVICE_HOST%:9292 |
|
47 |
-catalog.RegionOne.image.internalURL = http://%SERVICE_HOST%:9292 |
|
48 |
-catalog.RegionOne.image.name = Image Service |
|
49 |
- |
|
50 |
-catalog.RegionOne.cloudformation.publicURL = http://%SERVICE_HOST%:8000/v1 |
|
51 |
-catalog.RegionOne.cloudformation.adminURL = http://%SERVICE_HOST%:8000/v1 |
|
52 |
-catalog.RegionOne.cloudformation.internalURL = http://%SERVICE_HOST%:8000/v1 |
|
53 |
-catalog.RegionOne.cloudformation.name = CloudFormation service |
|
54 |
- |
|
55 |
-catalog.RegionOne.orchestration.publicURL = http://%SERVICE_HOST%:8004/v1/$(tenant_id)s |
|
56 |
-catalog.RegionOne.orchestration.adminURL = http://%SERVICE_HOST%:8004/v1/$(tenant_id)s |
|
57 |
-catalog.RegionOne.orchestration.internalURL = http://%SERVICE_HOST%:8004/v1/$(tenant_id)s |
|
58 |
-catalog.RegionOne.orchestration.name = Orchestration Service |
|
59 |
- |
|
60 |
-catalog.RegionOne.metering.publicURL = http://%SERVICE_HOST%:8777/v1 |
|
61 |
-catalog.RegionOne.metering.adminURL = http://%SERVICE_HOST%:8777/v1 |
|
62 |
-catalog.RegionOne.metering.internalURL = http://%SERVICE_HOST%:8777/v1 |
|
63 |
-catalog.RegionOne.metering.name = Telemetry Service |
... | ... |
@@ -369,20 +369,21 @@ function create_cinder_accounts { |
369 | 369 |
|
370 | 370 |
create_service_user "cinder" |
371 | 371 |
|
372 |
- if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then |
|
373 |
- |
|
374 |
- get_or_create_service "cinder" "volume" "Cinder Volume Service" |
|
375 |
- get_or_create_endpoint "volume" "$REGION_NAME" \ |
|
376 |
- "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(tenant_id)s" \ |
|
377 |
- "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(tenant_id)s" \ |
|
378 |
- "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(tenant_id)s" |
|
379 |
- |
|
380 |
- get_or_create_service "cinderv2" "volumev2" "Cinder Volume Service V2" |
|
381 |
- get_or_create_endpoint "volumev2" "$REGION_NAME" \ |
|
382 |
- "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v2/\$(tenant_id)s" \ |
|
383 |
- "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v2/\$(tenant_id)s" \ |
|
384 |
- "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v2/\$(tenant_id)s" |
|
385 |
- fi |
|
372 |
+ get_or_create_service "cinder" "volume" "Cinder Volume Service" |
|
373 |
+ get_or_create_endpoint \ |
|
374 |
+ "volume" \ |
|
375 |
+ "$REGION_NAME" \ |
|
376 |
+ "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(tenant_id)s" \ |
|
377 |
+ "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(tenant_id)s" \ |
|
378 |
+ "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(tenant_id)s" |
|
379 |
+ |
|
380 |
+ get_or_create_service "cinderv2" "volumev2" "Cinder Volume Service V2" |
|
381 |
+ get_or_create_endpoint \ |
|
382 |
+ "volumev2" \ |
|
383 |
+ "$REGION_NAME" \ |
|
384 |
+ "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v2/\$(tenant_id)s" \ |
|
385 |
+ "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v2/\$(tenant_id)s" \ |
|
386 |
+ "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v2/\$(tenant_id)s" |
|
386 | 387 |
fi |
387 | 388 |
} |
388 | 389 |
|
... | ... |
@@ -244,15 +244,13 @@ function create_glance_accounts { |
244 | 244 |
get_or_add_user_project_role "ResellerAdmin" $glance_swift_user $SERVICE_TENANT_NAME |
245 | 245 |
fi |
246 | 246 |
|
247 |
- if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then |
|
248 |
- |
|
249 |
- get_or_create_service "glance" "image" "Glance Image Service" |
|
250 |
- get_or_create_endpoint "image" \ |
|
251 |
- "$REGION_NAME" \ |
|
252 |
- "$GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT" \ |
|
253 |
- "$GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT" \ |
|
254 |
- "$GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT" |
|
255 |
- fi |
|
247 |
+ get_or_create_service "glance" "image" "Glance Image Service" |
|
248 |
+ get_or_create_endpoint \ |
|
249 |
+ "image" \ |
|
250 |
+ "$REGION_NAME" \ |
|
251 |
+ "$GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT" \ |
|
252 |
+ "$GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT" \ |
|
253 |
+ "$GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT" |
|
256 | 254 |
fi |
257 | 255 |
} |
258 | 256 |
|
... | ... |
@@ -387,23 +387,21 @@ function create_heat_accounts { |
387 | 387 |
if [[ "$HEAT_STANDALONE" != "True" ]]; then |
388 | 388 |
|
389 | 389 |
create_service_user "heat" "admin" |
390 |
- |
|
391 |
- if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then |
|
392 |
- |
|
393 |
- get_or_create_service "heat" "orchestration" "Heat Orchestration Service" |
|
394 |
- get_or_create_endpoint "orchestration" \ |
|
395 |
- "$REGION_NAME" \ |
|
396 |
- "$SERVICE_PROTOCOL://$HEAT_API_HOST:$HEAT_API_PORT/v1/\$(tenant_id)s" \ |
|
397 |
- "$SERVICE_PROTOCOL://$HEAT_API_HOST:$HEAT_API_PORT/v1/\$(tenant_id)s" \ |
|
398 |
- "$SERVICE_PROTOCOL://$HEAT_API_HOST:$HEAT_API_PORT/v1/\$(tenant_id)s" |
|
399 |
- |
|
400 |
- get_or_create_service "heat-cfn" "cloudformation" "Heat CloudFormation Service" |
|
401 |
- get_or_create_endpoint "cloudformation" \ |
|
402 |
- "$REGION_NAME" \ |
|
403 |
- "$SERVICE_PROTOCOL://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT/v1" \ |
|
404 |
- "$SERVICE_PROTOCOL://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT/v1" \ |
|
405 |
- "$SERVICE_PROTOCOL://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT/v1" |
|
406 |
- fi |
|
390 |
+ get_or_create_service "heat" "orchestration" "Heat Orchestration Service" |
|
391 |
+ get_or_create_endpoint \ |
|
392 |
+ "orchestration" \ |
|
393 |
+ "$REGION_NAME" \ |
|
394 |
+ "$SERVICE_PROTOCOL://$HEAT_API_HOST:$HEAT_API_PORT/v1/\$(tenant_id)s" \ |
|
395 |
+ "$SERVICE_PROTOCOL://$HEAT_API_HOST:$HEAT_API_PORT/v1/\$(tenant_id)s" \ |
|
396 |
+ "$SERVICE_PROTOCOL://$HEAT_API_HOST:$HEAT_API_PORT/v1/\$(tenant_id)s" |
|
397 |
+ |
|
398 |
+ get_or_create_service "heat-cfn" "cloudformation" "Heat CloudFormation Service" |
|
399 |
+ get_or_create_endpoint \ |
|
400 |
+ "cloudformation" \ |
|
401 |
+ "$REGION_NAME" \ |
|
402 |
+ "$SERVICE_PROTOCOL://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT/v1" \ |
|
403 |
+ "$SERVICE_PROTOCOL://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT/v1" \ |
|
404 |
+ "$SERVICE_PROTOCOL://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT/v1" |
|
407 | 405 |
|
408 | 406 |
# heat_stack_user role is for users created by Heat |
409 | 407 |
get_or_create_role "heat_stack_user" |
... | ... |
@@ -52,13 +52,12 @@ KEYSTONE_CONF_DIR=${KEYSTONE_CONF_DIR:-/etc/keystone} |
52 | 52 |
KEYSTONE_CONF=$KEYSTONE_CONF_DIR/keystone.conf |
53 | 53 |
KEYSTONE_PASTE_INI=${KEYSTONE_PASTE_INI:-$KEYSTONE_CONF_DIR/keystone-paste.ini} |
54 | 54 |
|
55 |
+# NOTE(sdague): remove in Newton |
|
56 |
+KEYSTONE_CATALOG_BACKEND="sql" |
|
57 |
+ |
|
55 | 58 |
# Toggle for deploying Keystone under HTTPD + mod_wsgi |
56 | 59 |
KEYSTONE_USE_MOD_WSGI=${KEYSTONE_USE_MOD_WSGI:-${ENABLE_HTTPD_MOD_WSGI_SERVICES}} |
57 | 60 |
|
58 |
-# Select the Catalog backend driver |
|
59 |
-KEYSTONE_CATALOG_BACKEND=${KEYSTONE_CATALOG_BACKEND:-sql} |
|
60 |
-KEYSTONE_CATALOG=$KEYSTONE_CONF_DIR/default_catalog.templates |
|
61 |
- |
|
62 | 61 |
# Select the token persistence backend driver |
63 | 62 |
KEYSTONE_TOKEN_BACKEND=${KEYSTONE_TOKEN_BACKEND:-sql} |
64 | 63 |
|
... | ... |
@@ -254,39 +253,6 @@ function configure_keystone { |
254 | 254 |
|
255 | 255 |
iniset $KEYSTONE_CONF token driver "$KEYSTONE_TOKEN_BACKEND" |
256 | 256 |
|
257 |
- iniset $KEYSTONE_CONF catalog driver "$KEYSTONE_CATALOG_BACKEND" |
|
258 |
- if [[ "$KEYSTONE_CATALOG_BACKEND" = "sql" ]]; then |
|
259 |
- # Configure ``keystone.conf`` to use sql |
|
260 |
- inicomment $KEYSTONE_CONF catalog template_file |
|
261 |
- else |
|
262 |
- deprecated "Using templated service catalog in devstack is deprecated" |
|
263 |
- cp -p $FILES/default_catalog.templates $KEYSTONE_CATALOG |
|
264 |
- |
|
265 |
- # Add swift endpoints to service catalog if swift is enabled |
|
266 |
- if is_service_enabled s-proxy; then |
|
267 |
- echo "catalog.RegionOne.object_store.publicURL = http://%SERVICE_HOST%:$SWIFT_DEFAULT_BIND_PORT/v1/AUTH_\$(tenant_id)s" >> $KEYSTONE_CATALOG |
|
268 |
- echo "catalog.RegionOne.object_store.adminURL = http://%SERVICE_HOST%:$SWIFT_DEFAULT_BIND_PORT/" >> $KEYSTONE_CATALOG |
|
269 |
- echo "catalog.RegionOne.object_store.internalURL = http://%SERVICE_HOST%:$SWIFT_DEFAULT_BIND_PORT/v1/AUTH_\$(tenant_id)s" >> $KEYSTONE_CATALOG |
|
270 |
- echo "catalog.RegionOne.object_store.name = Swift Service" >> $KEYSTONE_CATALOG |
|
271 |
- fi |
|
272 |
- |
|
273 |
- # Add neutron endpoints to service catalog if neutron is enabled |
|
274 |
- if is_service_enabled neutron; then |
|
275 |
- echo "catalog.RegionOne.network.publicURL = http://%SERVICE_HOST%:$Q_PORT/" >> $KEYSTONE_CATALOG |
|
276 |
- echo "catalog.RegionOne.network.adminURL = http://%SERVICE_HOST%:$Q_PORT/" >> $KEYSTONE_CATALOG |
|
277 |
- echo "catalog.RegionOne.network.internalURL = http://%SERVICE_HOST%:$Q_PORT/" >> $KEYSTONE_CATALOG |
|
278 |
- echo "catalog.RegionOne.network.name = Neutron Service" >> $KEYSTONE_CATALOG |
|
279 |
- fi |
|
280 |
- |
|
281 |
- sed -e " |
|
282 |
- s,%SERVICE_HOST%,$SERVICE_HOST,g; |
|
283 |
- s,%S3_SERVICE_PORT%,$S3_SERVICE_PORT,g; |
|
284 |
- " -i $KEYSTONE_CATALOG |
|
285 |
- |
|
286 |
- # Configure ``keystone.conf`` to use templates |
|
287 |
- iniset $KEYSTONE_CONF catalog template_file "$KEYSTONE_CATALOG" |
|
288 |
- fi |
|
289 |
- |
|
290 | 257 |
# Set up logging |
291 | 258 |
if [ "$SYSLOG" != "False" ]; then |
292 | 259 |
iniset $KEYSTONE_CONF DEFAULT use_syslog "True" |
... | ... |
@@ -588,7 +554,6 @@ function stop_keystone { |
588 | 588 |
# - ``KEYSTONE_BIN_DIR`` |
589 | 589 |
# - ``ADMIN_PASSWORD`` |
590 | 590 |
# - ``IDENTITY_API_VERSION`` |
591 |
-# - ``KEYSTONE_CATALOG_BACKEND`` |
|
592 | 591 |
# - ``KEYSTONE_AUTH_URI`` |
593 | 592 |
# - ``REGION_NAME`` |
594 | 593 |
# - ``KEYSTONE_SERVICE_PROTOCOL`` |
... | ... |
@@ -616,19 +581,17 @@ function bootstrap_keystone { |
616 | 616 |
--os-identity-api-version 3 --os-auth-url $KEYSTONE_AUTH_URI \ |
617 | 617 |
--os-password $ADMIN_PASSWORD) |
618 | 618 |
|
619 |
- if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then |
|
620 |
- |
|
621 |
- export OS_TOKEN=$token_id |
|
622 |
- export OS_URL=$KEYSTONE_AUTH_URI/v3 |
|
623 |
- export OS_IDENTITY_API_VERSION=3 |
|
624 |
- |
|
625 |
- get_or_create_service "keystone" "identity" "Keystone Identity Service" |
|
626 |
- get_or_create_endpoint "identity" \ |
|
627 |
- "$REGION_NAME" \ |
|
628 |
- "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v$IDENTITY_API_VERSION" \ |
|
629 |
- "$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION" \ |
|
630 |
- "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v$IDENTITY_API_VERSION" |
|
631 |
- fi |
|
619 |
+ export OS_TOKEN=$token_id |
|
620 |
+ export OS_URL=$KEYSTONE_AUTH_URI/v3 |
|
621 |
+ export OS_IDENTITY_API_VERSION=3 |
|
622 |
+ |
|
623 |
+ get_or_create_service "keystone" "identity" "Keystone Identity Service" |
|
624 |
+ get_or_create_endpoint \ |
|
625 |
+ "identity" \ |
|
626 |
+ "$REGION_NAME" \ |
|
627 |
+ "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v$IDENTITY_API_VERSION" \ |
|
628 |
+ "$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION" \ |
|
629 |
+ "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v$IDENTITY_API_VERSION" |
|
632 | 630 |
|
633 | 631 |
unset OS_TOKEN OS_URL OS_IDENTITY_API_VERSION |
634 | 632 |
} |
... | ... |
@@ -525,15 +525,13 @@ function create_neutron_accounts { |
525 | 525 |
|
526 | 526 |
create_service_user "neutron" |
527 | 527 |
|
528 |
- if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then |
|
529 |
- |
|
530 |
- get_or_create_service "neutron" "network" "Neutron Service" |
|
531 |
- get_or_create_endpoint "network" \ |
|
532 |
- "$REGION_NAME" \ |
|
533 |
- "$Q_PROTOCOL://$SERVICE_HOST:$Q_PORT/" \ |
|
534 |
- "$Q_PROTOCOL://$SERVICE_HOST:$Q_PORT/" \ |
|
535 |
- "$Q_PROTOCOL://$SERVICE_HOST:$Q_PORT/" |
|
536 |
- fi |
|
528 |
+ get_or_create_service "neutron" "network" "Neutron Service" |
|
529 |
+ get_or_create_endpoint \ |
|
530 |
+ "network" \ |
|
531 |
+ "$REGION_NAME" \ |
|
532 |
+ "$Q_PROTOCOL://$SERVICE_HOST:$Q_PORT/" \ |
|
533 |
+ "$Q_PROTOCOL://$SERVICE_HOST:$Q_PORT/" \ |
|
534 |
+ "$Q_PROTOCOL://$SERVICE_HOST:$Q_PORT/" |
|
537 | 535 |
fi |
538 | 536 |
} |
539 | 537 |
|
... | ... |
@@ -415,29 +415,28 @@ function create_nova_accounts { |
415 | 415 |
# this service user when notifying nova of changes and that requires the admin role. |
416 | 416 |
create_service_user "nova" "admin" |
417 | 417 |
|
418 |
- if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then |
|
419 |
- local nova_api_url |
|
420 |
- if [[ "$NOVA_USE_MOD_WSGI" == "False" ]]; then |
|
421 |
- nova_api_url="$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT" |
|
422 |
- else |
|
423 |
- nova_api_url="$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST/compute" |
|
424 |
- fi |
|
425 |
- |
|
426 |
- get_or_create_service "nova_legacy" "compute_legacy" \ |
|
427 |
- "Nova Compute Service (Legacy 2.0)" |
|
428 |
- get_or_create_endpoint "compute_legacy" \ |
|
429 |
- "$REGION_NAME" \ |
|
430 |
- "$nova_api_url/v2/\$(tenant_id)s" \ |
|
431 |
- "$nova_api_url/v2/\$(tenant_id)s" \ |
|
432 |
- "$nova_api_url/v2/\$(tenant_id)s" |
|
433 |
- |
|
434 |
- get_or_create_service "nova" "compute" "Nova Compute Service" |
|
435 |
- get_or_create_endpoint "compute" \ |
|
436 |
- "$REGION_NAME" \ |
|
437 |
- "$nova_api_url/v2.1/\$(tenant_id)s" \ |
|
438 |
- "$nova_api_url/v2.1/\$(tenant_id)s" \ |
|
439 |
- "$nova_api_url/v2.1/\$(tenant_id)s" |
|
418 |
+ local nova_api_url |
|
419 |
+ if [[ "$NOVA_USE_MOD_WSGI" == "False" ]]; then |
|
420 |
+ nova_api_url="$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT" |
|
421 |
+ else |
|
422 |
+ nova_api_url="$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST/compute" |
|
440 | 423 |
fi |
424 |
+ |
|
425 |
+ get_or_create_service "nova_legacy" "compute_legacy" "Nova Compute Service (Legacy 2.0)" |
|
426 |
+ get_or_create_endpoint \ |
|
427 |
+ "compute_legacy" \ |
|
428 |
+ "$REGION_NAME" \ |
|
429 |
+ "$nova_api_url/v2/\$(tenant_id)s" \ |
|
430 |
+ "$nova_api_url/v2/\$(tenant_id)s" \ |
|
431 |
+ "$nova_api_url/v2/\$(tenant_id)s" |
|
432 |
+ |
|
433 |
+ get_or_create_service "nova" "compute" "Nova Compute Service" |
|
434 |
+ get_or_create_endpoint \ |
|
435 |
+ "compute" \ |
|
436 |
+ "$REGION_NAME" \ |
|
437 |
+ "$nova_api_url/v2.1/\$(tenant_id)s" \ |
|
438 |
+ "$nova_api_url/v2.1/\$(tenant_id)s" \ |
|
439 |
+ "$nova_api_url/v2.1/\$(tenant_id)s" |
|
441 | 440 |
fi |
442 | 441 |
|
443 | 442 |
if is_service_enabled n-api; then |
... | ... |
@@ -451,15 +450,13 @@ function create_nova_accounts { |
451 | 451 |
|
452 | 452 |
# S3 |
453 | 453 |
if is_service_enabled swift3; then |
454 |
- if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then |
|
455 |
- |
|
456 |
- get_or_create_service "s3" "s3" "S3" |
|
457 |
- get_or_create_endpoint "s3" \ |
|
458 |
- "$REGION_NAME" \ |
|
459 |
- "http://$SERVICE_HOST:$S3_SERVICE_PORT" \ |
|
460 |
- "http://$SERVICE_HOST:$S3_SERVICE_PORT" \ |
|
461 |
- "http://$SERVICE_HOST:$S3_SERVICE_PORT" |
|
462 |
- fi |
|
454 |
+ get_or_create_service "s3" "s3" "S3" |
|
455 |
+ get_or_create_endpoint \ |
|
456 |
+ "s3" \ |
|
457 |
+ "$REGION_NAME" \ |
|
458 |
+ "http://$SERVICE_HOST:$S3_SERVICE_PORT" \ |
|
459 |
+ "http://$SERVICE_HOST:$S3_SERVICE_PORT" \ |
|
460 |
+ "http://$SERVICE_HOST:$S3_SERVICE_PORT" |
|
463 | 461 |
fi |
464 | 462 |
} |
465 | 463 |
|
... | ... |
@@ -612,8 +612,6 @@ function create_swift_accounts { |
612 | 612 |
export swiftusertest3_password=testing3 |
613 | 613 |
export swiftusertest4_password=testing4 |
614 | 614 |
|
615 |
- KEYSTONE_CATALOG_BACKEND=${KEYSTONE_CATALOG_BACKEND:-sql} |
|
616 |
- |
|
617 | 615 |
local another_role |
618 | 616 |
another_role=$(get_or_create_role "anotherrole") |
619 | 617 |
|
... | ... |
@@ -621,15 +619,13 @@ function create_swift_accounts { |
621 | 621 |
# temp urls, which break when uploaded by a non-admin role |
622 | 622 |
create_service_user "swift" "admin" |
623 | 623 |
|
624 |
- if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then |
|
625 |
- |
|
626 |
- get_or_create_service "swift" "object-store" "Swift Service" |
|
627 |
- get_or_create_endpoint "object-store" \ |
|
628 |
- "$REGION_NAME" \ |
|
629 |
- "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT/v1/AUTH_\$(tenant_id)s" \ |
|
630 |
- "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT" \ |
|
631 |
- "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT/v1/AUTH_\$(tenant_id)s" |
|
632 |
- fi |
|
624 |
+ get_or_create_service "swift" "object-store" "Swift Service" |
|
625 |
+ get_or_create_endpoint \ |
|
626 |
+ "object-store" \ |
|
627 |
+ "$REGION_NAME" \ |
|
628 |
+ "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT/v1/AUTH_\$(tenant_id)s" \ |
|
629 |
+ "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT" \ |
|
630 |
+ "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT/v1/AUTH_\$(tenant_id)s" |
|
633 | 631 |
|
634 | 632 |
local swift_tenant_test1 |
635 | 633 |
swift_tenant_test1=$(get_or_create_project swifttenanttest1 default) |