From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 25 Jul 2016 13:34:03 +0000 (+0000)
Subject: Merge "Remove tenant_id from nova v2.1 endpoint"
X-Git-Tag: opnfv-6.0.0~1824
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=11a27c9a3b4e0969f3a89c2a9485f72317577c12;p=apex-tripleo-heat-templates.git

Merge "Remove tenant_id from nova v2.1 endpoint"
---

11a27c9a3b4e0969f3a89c2a9485f72317577c12
diff --cc network/endpoints/endpoint_data.yaml
index f1dee045,21e604ae..5afcf5de
--- a/network/endpoints/endpoint_data.yaml
+++ b/network/endpoints/endpoint_data.yaml
@@@ -154,9 -131,24 +154,9 @@@ Nova
      Admin:
          vip_param: NovaApi
          uri_suffixes:
-             '': /v2.1/%(tenant_id)s
+             '': /v2.1
      port: 8774
  
 -NovaEC2:
 -    Internal:
 -        vip_param: NovaApi
 -        uri_suffixes:
 -            '': /services/Cloud
 -    Public:
 -        vip_param: Public
 -        uri_suffixes:
 -            '': /services/Cloud
 -    Admin:
 -        vip_param: NovaApi
 -        uri_suffixes:
 -            '': /services/Admin
 -    port: 8773
 -
  NovaVNCProxy:
      Internal:
          vip_param: NovaApi