diff options
| author | Ziad Sawalha <github@highbridgellc.com> | 2011-12-06 12:32:40 -0600 |
|---|---|---|
| committer | Ziad Sawalha <github@highbridgellc.com> | 2011-12-06 12:32:40 -0600 |
| commit | 78d04dc0cdc500058bcf62cf4ec2a65f131b3a07 (patch) | |
| tree | eb3610c329390536f6f910907969101e81119c8d | |
| parent | 0d8bc572339bc8defe5ea5fba16eedcd79c5472b (diff) | |
| download | keystone-78d04dc0cdc500058bcf62cf4ec2a65f131b3a07.tar.gz keystone-78d04dc0cdc500058bcf62cf4ec2a65f131b3a07.tar.xz keystone-78d04dc0cdc500058bcf62cf4ec2a65f131b3a07.zip | |
Bug 897496: Remove tenant id from Glance URLs
Glance URLs do not have the tenant ID in them. These were removed in the sample data
and documentation.
Fixes bug 897496
Change-Id: I49210d2560739f1409c8816c5610ef9c3b033f1d
| -rw-r--r-- | doc/source/adminAPI_curl_examples.rst | 6 | ||||
| -rw-r--r-- | keystone/test/sampledata.py | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/source/adminAPI_curl_examples.rst b/doc/source/adminAPI_curl_examples.rst index 007a1843..81f96c36 100644 --- a/doc/source/adminAPI_curl_examples.rst +++ b/doc/source/adminAPI_curl_examples.rst @@ -254,14 +254,14 @@ Returns:: "publicURL": "http://nova.publicinternets.com/v1.1/ }, { - "internalURL": "http://127.0.0.1:9292/v1.1/1", + "internalURL": "http://127.0.0.1:9292/v1.1/", "name": "glance", - "adminURL": "http://nova.admin-nets.local/v1.1/1", + "adminURL": "http://nova.admin-nets.local/v1.1/", "region": "RegionOne", "tenantId": 1, "type": "image", "id": 4, - "publicURL": "http://glance.publicinternets.com/v1.1/1" + "publicURL": "http://glance.publicinternets.com/v1.1/" }, { "internalURL": "http://127.0.0.1:7777/v1.1/1", diff --git a/keystone/test/sampledata.py b/keystone/test/sampledata.py index 9dd53ae3..677845dc 100644 --- a/keystone/test/sampledata.py +++ b/keystone/test/sampledata.py @@ -56,9 +56,9 @@ DEFAULT_FIXTURE = [ 'http://nova.publicinternets.com/v1.1/', 'http://127.0.0.1:8774/v1.1', 'http://localhost:8774/v1.1', '1', '0'), ('endpointTemplates', 'add', 'RegionOne', 'glance', - 'http://glance.publicinternets.com/v1.1/%tenant_id%', - 'http://nova.admin-nets.local/v1.1/%tenant_id%', - 'http://127.0.0.1:9292/v1.1/%tenant_id%', '1', '0'), + 'http://glance.publicinternets.com/v1.1/', + 'http://nova.admin-nets.local/v1.1/', + 'http://127.0.0.1:9292/v1.1/', '1', '0'), ('endpointTemplates', 'add', 'RegionOne', 'cdn', 'http://cdn.publicinternets.com/v1.1/%tenant_id%', 'http://cdn.admin-nets.local/v1.1/%tenant_id%', @@ -76,9 +76,9 @@ DEFAULT_FIXTURE = [ 'http://nova.publicinternets.com/v1.1/', 'http://127.0.0.1:8774/v1.1', 'http://localhost:8774/v1.1', '1', '0'), ('endpointTemplates', 'add', 'RegionOne', 'glance', - 'http://glance.publicinternets.com/v1.1/%tenant_id%', - 'http://nova.admin-nets.local/v1.1/%tenant_id%', - 'http://127.0.0.1:9292/v1.1/%tenant_id%', '1', '0'), + 'http://glance.publicinternets.com/v1.1/', + 'http://nova.admin-nets.local/v1.1/', + 'http://127.0.0.1:9292/v1.1/', '1', '0'), ('endpointTemplates', 'add', 'RegionOne', 'cdn', 'http://cdn.publicinternets.com/v1.1/%tenant_id%', 'http://cdn.admin-nets.local/v1.1/%tenant_id%', |