From bd27cc2e675ad5d0e21065ea3029d02ea5a2716a Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 4 Apr 2016 09:12:24 -0400 Subject: [PATCH] switch over nova to using $(project_id) in service catalog This makes one less place we reference tenant_id Change-Id: I53dfeb4d23a9babf7bb46fd3736b4ac005e45993 --- lib/nova | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/nova b/lib/nova index ab2bef8ae0..1b3d08651b 100644 --- a/lib/nova +++ b/lib/nova @@ -421,17 +421,17 @@ function create_nova_accounts { get_or_create_endpoint \ "compute_legacy" \ "$REGION_NAME" \ - "$nova_api_url/v2/\$(tenant_id)s" \ - "$nova_api_url/v2/\$(tenant_id)s" \ - "$nova_api_url/v2/\$(tenant_id)s" + "$nova_api_url/v2/\$(project_id)s" \ + "$nova_api_url/v2/\$(project_id)s" \ + "$nova_api_url/v2/\$(project_id)s" get_or_create_service "nova" "compute" "Nova Compute Service" get_or_create_endpoint \ "compute" \ "$REGION_NAME" \ - "$nova_api_url/v2.1/\$(tenant_id)s" \ - "$nova_api_url/v2.1/\$(tenant_id)s" \ - "$nova_api_url/v2.1/\$(tenant_id)s" + "$nova_api_url/v2.1/\$(project_id)s" \ + "$nova_api_url/v2.1/\$(project_id)s" \ + "$nova_api_url/v2.1/\$(project_id)s" fi if is_service_enabled n-api; then