1. devstack
  2. Commit bd27cc2e675ad5d0e21065ea3029d02ea5a2716a
Browse code

switch over nova to using $(project_id) in service catalog

This makes one less place we reference tenant_id

Change-Id: I53dfeb4d23a9babf7bb46fd3736b4ac005e45993

Sean Dague authored on 2016/04/04 22:12:24
Showing 1 changed files
lib/nova
History View file @ bd27cc2
... ... 
@@ -421,17 +421,17 @@ function create_nova_accounts {
421 421 
         get_or_create_endpoint \
422 422 
             "compute_legacy" \
423 423 
             "$REGION_NAME" \
424 
-            "$nova_api_url/v2/\$(tenant_id)s" \
425 
-            "$nova_api_url/v2/\$(tenant_id)s" \
426 
-            "$nova_api_url/v2/\$(tenant_id)s"
424 
+            "$nova_api_url/v2/\$(project_id)s" \
425 
+            "$nova_api_url/v2/\$(project_id)s" \
426 
+            "$nova_api_url/v2/\$(project_id)s"
427 427
428 428 
         get_or_create_service "nova" "compute" "Nova Compute Service"
429 429 
         get_or_create_endpoint \
430 430 
             "compute" \
431 431 
             "$REGION_NAME" \
432 
-            "$nova_api_url/v2.1/\$(tenant_id)s" \
433 
-            "$nova_api_url/v2.1/\$(tenant_id)s" \
434 
-            "$nova_api_url/v2.1/\$(tenant_id)s"
432 
+            "$nova_api_url/v2.1/\$(project_id)s" \
433 
+            "$nova_api_url/v2.1/\$(project_id)s" \
434 
+            "$nova_api_url/v2.1/\$(project_id)s"
435 435 
     fi
436 436
437 437 
     if is_service_enabled n-api; then