diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-03 15:33:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-03 15:33:04 +0000 |
| commit | 3986128c283227b8eb16d1ff1776175e6de12c54 (patch) | |
| tree | 814c1f1c8f96bf9e156779dae52cea9dd4fc4e39 /network | |
| parent | 53715e0bd8100a21f9b36ada4fc2099726ae3cbd (diff) | |
| parent | 30a8eb247a168215cdc3870000867af243a123cd (diff) | |
Merge "endpoint_map: bump nova api from 2.0 to 2.1"
Diffstat (limited to 'network')
| -rw-r--r-- | network/endpoints/endpoint_data.yaml | 6 | ||||
| -rw-r--r-- | network/endpoints/endpoint_map.yaml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml index 9d508d18..7a0bbf4a 100644 --- a/network/endpoints/endpoint_data.yaml +++ b/network/endpoints/endpoint_data.yaml @@ -122,17 +122,17 @@ Nova: Internal: vip_param: NovaApi uri_suffixes: - '': /v2/%(tenant_id)s + '': /v2.1/%(tenant_id)s V3: /v3 Public: vip_param: Public uri_suffixes: - '': /v2/%(tenant_id)s + '': /v2.1/%(tenant_id)s V3: /v3 Admin: vip_param: NovaApi uri_suffixes: - '': /v2/%(tenant_id)s + '': /v2.1/%(tenant_id)s V3: /v3 port: 8774 diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml index e9f97fa1..619423d2 100644 --- a/network/endpoints/endpoint_map.yaml +++ b/network/endpoints/endpoint_map.yaml @@ -1212,7 +1212,7 @@ outputs: IP_ADDRESS: {get_param: NovaApiVirtualIP} - ':' - get_param: [EndpointMap, NovaAdmin, port] - - /v2/%(tenant_id)s + - /v2.1/%(tenant_id)s uri_no_suffix: list_join: - '' @@ -1251,7 +1251,7 @@ outputs: IP_ADDRESS: {get_param: NovaApiVirtualIP} - ':' - get_param: [EndpointMap, NovaInternal, port] - - /v2/%(tenant_id)s + - /v2.1/%(tenant_id)s uri_no_suffix: list_join: - '' @@ -1290,7 +1290,7 @@ outputs: IP_ADDRESS: {get_param: PublicVirtualIP} - ':' - get_param: [EndpointMap, NovaPublic, port] - - /v2/%(tenant_id)s + - /v2.1/%(tenant_id)s uri_no_suffix: list_join: - '' |