Merge "Remove tenant_id from nova v2.1 endpoint"

diff --cc network/endpoints/endpoint_data.yaml
index f1dee04,21e604a..5afcf5d
--- 1/network/endpoints/endpoint_data.yaml
--- 2/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

diff --cc network/endpoints/endpoint_map.yaml
Simple merge