diff options
| -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%', |