summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-03-08 22:29:04 +0000
committerGerrit Code Review <review@openstack.org>2012-03-08 22:29:04 +0000
commit0a124fa6a114ba357f6aec9ba4da5eb503483a95 (patch)
tree9a566e282af090d092bf20c58fa11e97e7abf299
parenta2f2274c69df2ca5b040a69173f3eb7eb030c561 (diff)
parent524cbd58acd0c47664e164f72f25524cb95b09f0 (diff)
Merge "add more default catalog templates"
-rw-r--r--etc/default_catalog.templates15
1 files changed, 15 insertions, 0 deletions
diff --git a/etc/default_catalog.templates b/etc/default_catalog.templates
index c12b5c4c..7f1317d4 100644
--- a/etc/default_catalog.templates
+++ b/etc/default_catalog.templates
@@ -10,3 +10,18 @@ catalog.RegionOne.compute.publicURL = http://localhost:$(compute_port)s/v1.1/$(t
catalog.RegionOne.compute.adminURL = http://localhost:$(compute_port)s/v1.1/$(tenant_id)s
catalog.RegionOne.compute.internalURL = http://localhost:$(compute_port)s/v1.1/$(tenant_id)s
catalog.RegionOne.compute.name = 'Compute Service'
+
+catalog.RegionOne.volume.publicURL = http://localhost:8776/v1/$(tenant_id)s
+catalog.RegionOne.volume.adminURL = http://localhost:8776/v1/$(tenant_id)s
+catalog.RegionOne.volume.internalURL = http://localhost:8776/v1/$(tenant_id)s
+catalog.RegionOne.volume.name = 'Volume Service'
+
+catalog.RegionOne.ec2.publicURL = http://localhost:8773/services/Cloud
+catalog.RegionOne.ec2.adminURL = http://localhost:8773/services/Admin
+catalog.RegionOne.ec2.internalURL = http://localhost:8773/services/Cloud
+catalog.RegionOne.ec2.name = 'EC2 Service'
+
+catalog.RegionOne.image.publicURL = http://localhost:9292/v1
+catalog.RegionOne.image.adminURL = http://localhost:9292/v1
+catalog.RegionOne.image.internalURL = http://localhost:9292/v1
+catalog.RegionOne.image.name = 'Image Service'