Fix double-quoted service names

Dean Troyer · Dean Troyer · commit 06a09d0c33f0 · 2012-03-12T14:46:45.000-05:00
The Keystone service template parser doesn't do any quote interpolation,
it just splits on ' = ' and passes the two parts on. So we just remove
the quotes for now.

Fixes bug 943523

Change-Id: Ia2a10ec18db1a82f23f36200b0cdef84b4f78155
diff --git a/files/default_catalog.templates b/files/default_catalog.templates
@@ -3,34 +3,34 @@
 catalog.RegionOne.identity.publicURL = http://%SERVICE_HOST%:$(public_port)s/v2.0
 catalog.RegionOne.identity.adminURL = http://%SERVICE_HOST%:$(admin_port)s/v2.0
 catalog.RegionOne.identity.internalURL = http://%SERVICE_HOST%:$(public_port)s/v2.0
-catalog.RegionOne.identity.name = 'Identity Service'
+catalog.RegionOne.identity.name = Identity Service
 
 
 catalog.RegionOne.compute.publicURL = http://%SERVICE_HOST%:8774/v2/$(tenant_id)s
 catalog.RegionOne.compute.adminURL = http://%SERVICE_HOST%:8774/v2/$(tenant_id)s
 catalog.RegionOne.compute.internalURL = http://%SERVICE_HOST%:8774/v2/$(tenant_id)s
-catalog.RegionOne.compute.name = 'Compute Service'
+catalog.RegionOne.compute.name = Compute Service
 
 
 catalog.RegionOne.volume.publicURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s
 catalog.RegionOne.volume.adminURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s
 catalog.RegionOne.volume.internalURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s
-catalog.RegionOne.volume.name = 'Volume Service'
+catalog.RegionOne.volume.name = Volume Service
 
 
 catalog.RegionOne.ec2.publicURL = http://%SERVICE_HOST%:8773/services/Cloud
 catalog.RegionOne.ec2.adminURL = http://%SERVICE_HOST%:8773/services/Admin
 catalog.RegionOne.ec2.internalURL = http://%SERVICE_HOST%:8773/services/Cloud
-catalog.RegionOne.ec2.name = 'EC2 Service'
+catalog.RegionOne.ec2.name = EC2 Service
 
 
 catalog.RegionOne.s3.publicURL = http://%SERVICE_HOST%:3333
 catalog.RegionOne.s3.adminURL = http://%SERVICE_HOST%:3333
 catalog.RegionOne.s3.internalURL = http://%SERVICE_HOST%:3333
-catalog.RegionOne.s3.name = 'S3 Service'
+catalog.RegionOne.s3.name = S3 Service
 
 
 catalog.RegionOne.image.publicURL = http://%SERVICE_HOST%:9292/v1
 catalog.RegionOne.image.adminURL = http://%SERVICE_HOST%:9292/v1
 catalog.RegionOne.image.internalURL = http://%SERVICE_HOST%:9292/v1
-catalog.RegionOne.image.name = 'Image Service'
+catalog.RegionOne.image.name = Image Service
