In current implemetation these two urls are defined from Nova
definitions. And urls point to nova. But standalone EC2API
project has another urls that are defined in keystone catalog
in plugin setup.
I suggest to use urls from catalog to be able to test
stackforge/ec2-api by current tempest.
Change-Id: Ibec8c36a8c2fc7ea3d8fab57819adae5f7378045
... | ... |
@@ -271,6 +271,15 @@ function configure_tempest { |
271 | 271 |
fi |
272 | 272 |
fi |
273 | 273 |
|
274 |
+ EC2_URL=$(openstack endpoint show -f value -c publicurl ec2 || true) |
|
275 |
+ if [[ -z $EC2_URL ]]; then |
|
276 |
+ EC2_URL="$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/" |
|
277 |
+ fi |
|
278 |
+ S3_URL=$(openstack endpoint show -f value -c publicurl s3 || true) |
|
279 |
+ if [[ -z $S3_URL ]]; then |
|
280 |
+ S3_URL="http://$SERVICE_HOST:${S3_SERVICE_PORT:-3333}" |
|
281 |
+ fi |
|
282 |
+ |
|
274 | 283 |
iniset $TEMPEST_CONFIG DEFAULT use_syslog $SYSLOG |
275 | 284 |
|
276 | 285 |
# Oslo |
... | ... |
@@ -375,8 +384,8 @@ function configure_tempest { |
375 | 375 |
iniset $TEMPEST_CONFIG network-feature-enabled api_extensions $network_api_extensions |
376 | 376 |
|
377 | 377 |
# boto |
378 |
- iniset $TEMPEST_CONFIG boto ec2_url "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/" |
|
379 |
- iniset $TEMPEST_CONFIG boto s3_url "http://$SERVICE_HOST:${S3_SERVICE_PORT:-3333}" |
|
378 |
+ iniset $TEMPEST_CONFIG boto ec2_url "$EC2_URL" |
|
379 |
+ iniset $TEMPEST_CONFIG boto s3_url "$S3_URL" |
|
380 | 380 |
iniset $TEMPEST_CONFIG boto s3_materials_path "$BOTO_MATERIALS_PATH" |
381 | 381 |
iniset $TEMPEST_CONFIG boto ari_manifest cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-initrd.manifest.xml |
382 | 382 |
iniset $TEMPEST_CONFIG boto ami_manifest cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-blank.img.manifest.xml |