Fixes bug 958894.
Change-Id: Id517519b027c70eff22e04b79597f6d47fcc5eed
| ... | ... |
@@ -1460,7 +1460,7 @@ if is_service_enabled key; then |
| 1460 | 1460 |
echo "catalog.RegionOne.object_store.publicURL = http://%SERVICE_HOST%:8080/v1/AUTH_\$(tenant_id)s" >> $KEYSTONE_CATALOG |
| 1461 | 1461 |
echo "catalog.RegionOne.object_store.adminURL = http://%SERVICE_HOST%:8080/" >> $KEYSTONE_CATALOG |
| 1462 | 1462 |
echo "catalog.RegionOne.object_store.internalURL = http://%SERVICE_HOST%:8080/v1/AUTH_\$(tenant_id)s" >> $KEYSTONE_CATALOG |
| 1463 |
- echo "catalog.RegionOne.object_store.name = 'Swift Service'" >> $KEYSTONE_CATALOG |
|
| 1463 |
+ echo "catalog.RegionOne.object_store.name = Swift Service" >> $KEYSTONE_CATALOG |
|
| 1464 | 1464 |
fi |
| 1465 | 1465 |
|
| 1466 | 1466 |
# Add quantum endpoints to service catalog if quantum is enabled |
| ... | ... |
@@ -1468,7 +1468,7 @@ if is_service_enabled key; then |
| 1468 | 1468 |
echo "catalog.RegionOne.network.publicURL = http://%SERVICE_HOST%:9696/" >> $KEYSTONE_CATALOG |
| 1469 | 1469 |
echo "catalog.RegionOne.network.adminURL = http://%SERVICE_HOST%:9696/" >> $KEYSTONE_CATALOG |
| 1470 | 1470 |
echo "catalog.RegionOne.network.internalURL = http://%SERVICE_HOST%:9696/" >> $KEYSTONE_CATALOG |
| 1471 |
- echo "catalog.RegionOne.network.name = 'Quantum Service'" >> $KEYSTONE_CATALOG |
|
| 1471 |
+ echo "catalog.RegionOne.network.name = Quantum Service" >> $KEYSTONE_CATALOG |
|
| 1472 | 1472 |
fi |
| 1473 | 1473 |
|
| 1474 | 1474 |
sudo sed -e "s,%SERVICE_HOST%,$SERVICE_HOST,g" -i $KEYSTONE_CATALOG |