summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-10-12 19:50:35 +0000
committerGerrit Code Review <review@openstack.org>2011-10-12 19:50:35 +0000
commit0a5f1fe24fefe55b75cd217492a04367128cd548 (patch)
treeaa47ce6864b91ad5cf0396541f4758616ad0713a
parent0c1616725a9edeaf48966634f51c30f8ea65a464 (diff)
parentb13b19b21c5119a76f08cabe784f5a3f1d64b589 (diff)
downloadkeystone-0a5f1fe24fefe55b75cd217492a04367128cd548.tar.gz
keystone-0a5f1fe24fefe55b75cd217492a04367128cd548.tar.xz
keystone-0a5f1fe24fefe55b75cd217492a04367128cd548.zip
Merge "Changes to show admin URL also as a part of json in endpoints listing"
-rw-r--r--keystone/content/common/samples/endpoint.json1
-rw-r--r--keystone/content/common/samples/endpoints.json5
2 files changed, 6 insertions, 0 deletions
diff --git a/keystone/content/common/samples/endpoint.json b/keystone/content/common/samples/endpoint.json
index e65fc36b..06c85bfc 100644
--- a/keystone/content/common/samples/endpoint.json
+++ b/keystone/content/common/samples/endpoint.json
@@ -6,6 +6,7 @@
"type": "compute",
"publicURL": "https://compute.north.public.com/v1",
"internalURL": "https://compute.north.internal.com/v1",
+ "adminURL" : "https://compute.north.internal.com/v1",
"versionId": "1",
"versionInfo": "https://compute.north.public.com/v1/",
"versionList": "https://compute.north.public.com/"
diff --git a/keystone/content/common/samples/endpoints.json b/keystone/content/common/samples/endpoints.json
index 0ff86a63..e84a7b3b 100644
--- a/keystone/content/common/samples/endpoints.json
+++ b/keystone/content/common/samples/endpoints.json
@@ -6,6 +6,7 @@
"type":"compute",
"publicURL":"https://compute.north.public.com/v1",
"internalURL":"https://compute.north.internal.com/v1",
+ "adminURL" : "https://compute.north.internal.com/v1",
"versionId":"1",
"versionInfo":"https://compute.north.public.com/v1/",
"versionList":"https://compute.north.public.com/"
@@ -17,6 +18,7 @@
"type":"compute",
"publicURL":"https://compute.north.public.com/v1",
"internalURL":"https://compute.north.internal.com/v1",
+ "adminURL" : "https://compute.north.internal.com/v1",
"versionId":"1",
"versionInfo":"https://compute.north.public.com/v1/",
"versionList":"https://compute.north.public.com/"
@@ -28,6 +30,7 @@
"type":"compute",
"publicURL":"https://compute.north.public.com/v1",
"internalURL":"https://compute.north.internal.com/v1",
+ "adminURL" : "https://compute.north.internal.com/v1",
"versionId":"1",
"versionInfo":"https://compute.north.public.com/v1/",
"versionList":"https://compute.north.public.com/"
@@ -39,6 +42,7 @@
"type":"compute",
"publicURL":"https://compute.north.public.com/v1",
"internalURL":"https://compute.north.internal.com/v1",
+ "adminURL" : "https://compute.north.internal.com/v1",
"versionId":"1",
"versionInfo":"https://compute.north.public.com/v1/",
"versionList":"https://compute.north.public.com/"
@@ -50,6 +54,7 @@
"type":"compute",
"publicURL":"https://compute.north.public.com/v1",
"internalURL":"https://compute.north.internal.com/v1",
+ "adminURL" : "https://compute.north.internal.com/v1",
"versionId":"1",
"versionInfo":"https://compute.north.public.com/v1/",
"versionList":"https://compute.north.public.com/"