0bd2410d46
* Remove credential creation from files/keystone_data.sh * Remove EC2 cert setup from openrc * Remove sourcing of ec2rc from stackrc * Collect the above in eucarc * Allow rc files to be sourced from other directories; based on Chmouel's 4881 proposal but is simpler and doesn't actually change the directory * Create S3 endpoint * Get EC2 and S3 endpoints from Keystone service catalog * Add EC2 credential checks to exercises/client-env.sh * exercises/bundle.sh and exercises/euca.sh use eucarc Updates: * remove readlink -f to stay bash 3 compatible * use service catalog * create S3 endpoint Fixes bug 949528 Change-Id: I58caea8cecbbd10661779bc2d150d241f4a5822e
37 lines
1.7 KiB
Plaintext
37 lines
1.7 KiB
Plaintext
# config for TemplatedCatalog, using camelCase because I don't want to do
|
|
# translations for legacy compat
|
|
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.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.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.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.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.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'
|