@@ -271,6 +271,15 @@ function configure_tempest {

         fi

     fi

+    EC2_URL=$(openstack endpoint show -f value -c publicurl ec2 || true)

+    if [[ -z $EC2_URL ]]; then

+        EC2_URL="$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/"

+    fi

+    S3_URL=$(openstack endpoint show -f value -c publicurl s3 || true)

+    if [[ -z $S3_URL ]]; then

+        S3_URL="http://$SERVICE_HOST:${S3_SERVICE_PORT:-3333}"

+    fi

+

     iniset $TEMPEST_CONFIG DEFAULT use_syslog $SYSLOG

     # Oslo

@@ -375,8 +384,8 @@ function configure_tempest {

     iniset $TEMPEST_CONFIG network-feature-enabled api_extensions $network_api_extensions

     # boto

-    iniset $TEMPEST_CONFIG boto ec2_url "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/"

-    iniset $TEMPEST_CONFIG boto s3_url "http://$SERVICE_HOST:${S3_SERVICE_PORT:-3333}"

+    iniset $TEMPEST_CONFIG boto ec2_url "$EC2_URL"

+    iniset $TEMPEST_CONFIG boto s3_url "$S3_URL"

     iniset $TEMPEST_CONFIG boto s3_materials_path "$BOTO_MATERIALS_PATH"

     iniset $TEMPEST_CONFIG boto ari_manifest cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-initrd.manifest.xml

     iniset $TEMPEST_CONFIG boto ami_manifest cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-blank.img.manifest.xml