Browse code
Fix double-quoted service names
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
Dean Troyer authored on 2012/03/13 04:43:26Showing 1 changed files
| ... | ... |
@@ -3,34 +3,34 @@ |
| 3 | 3 |
catalog.RegionOne.identity.publicURL = http://%SERVICE_HOST%:$(public_port)s/v2.0 |
| 4 | 4 |
catalog.RegionOne.identity.adminURL = http://%SERVICE_HOST%:$(admin_port)s/v2.0 |
| 5 | 5 |
catalog.RegionOne.identity.internalURL = http://%SERVICE_HOST%:$(public_port)s/v2.0 |
| 6 |
-catalog.RegionOne.identity.name = 'Identity Service' |
|
| 6 |
+catalog.RegionOne.identity.name = Identity Service |
|
| 7 | 7 |
|
| 8 | 8 |
|
| 9 | 9 |
catalog.RegionOne.compute.publicURL = http://%SERVICE_HOST%:8774/v2/$(tenant_id)s |
| 10 | 10 |
catalog.RegionOne.compute.adminURL = http://%SERVICE_HOST%:8774/v2/$(tenant_id)s |
| 11 | 11 |
catalog.RegionOne.compute.internalURL = http://%SERVICE_HOST%:8774/v2/$(tenant_id)s |
| 12 |
-catalog.RegionOne.compute.name = 'Compute Service' |
|
| 12 |
+catalog.RegionOne.compute.name = Compute Service |
|
| 13 | 13 |
|
| 14 | 14 |
|
| 15 | 15 |
catalog.RegionOne.volume.publicURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s |
| 16 | 16 |
catalog.RegionOne.volume.adminURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s |
| 17 | 17 |
catalog.RegionOne.volume.internalURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s |
| 18 |
-catalog.RegionOne.volume.name = 'Volume Service' |
|
| 18 |
+catalog.RegionOne.volume.name = Volume Service |
|
| 19 | 19 |
|
| 20 | 20 |
|
| 21 | 21 |
catalog.RegionOne.ec2.publicURL = http://%SERVICE_HOST%:8773/services/Cloud |
| 22 | 22 |
catalog.RegionOne.ec2.adminURL = http://%SERVICE_HOST%:8773/services/Admin |
| 23 | 23 |
catalog.RegionOne.ec2.internalURL = http://%SERVICE_HOST%:8773/services/Cloud |
| 24 |
-catalog.RegionOne.ec2.name = 'EC2 Service' |
|
| 24 |
+catalog.RegionOne.ec2.name = EC2 Service |
|
| 25 | 25 |
|
| 26 | 26 |
|
| 27 | 27 |
catalog.RegionOne.s3.publicURL = http://%SERVICE_HOST%:3333 |
| 28 | 28 |
catalog.RegionOne.s3.adminURL = http://%SERVICE_HOST%:3333 |
| 29 | 29 |
catalog.RegionOne.s3.internalURL = http://%SERVICE_HOST%:3333 |
| 30 |
-catalog.RegionOne.s3.name = 'S3 Service' |
|
| 30 |
+catalog.RegionOne.s3.name = S3 Service |
|
| 31 | 31 |
|
| 32 | 32 |
|
| 33 | 33 |
catalog.RegionOne.image.publicURL = http://%SERVICE_HOST%:9292/v1 |
| 34 | 34 |
catalog.RegionOne.image.adminURL = http://%SERVICE_HOST%:9292/v1 |
| 35 | 35 |
catalog.RegionOne.image.internalURL = http://%SERVICE_HOST%:9292/v1 |
| 36 |
-catalog.RegionOne.image.name = 'Image Service' |
|
| 36 |
+catalog.RegionOne.image.name = Image Service |