@@ -30,9 +30,9 @@ catalog.RegionOne.volumev2.internalURL = http://%SERVICE_HOST%:8776/v2/$(tenant_

 catalog.RegionOne.volumev2.name = Volume Service V2

-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.publicURL = http://%SERVICE_HOST%:8773/

+catalog.RegionOne.ec2.adminURL = http://%SERVICE_HOST%:8773/

+catalog.RegionOne.ec2.internalURL = http://%SERVICE_HOST%:8773/

 catalog.RegionOne.ec2.name = EC2 Service

@@ -395,9 +395,9 @@ function create_nova_accounts {

                 "ec2" "EC2 Compatibility Layer")

             get_or_create_endpoint $ec2_service \

                 "$REGION_NAME" \

-                "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/services/Cloud" \

-                "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/services/Admin" \

-                "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/services/Cloud"

+                "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/" \

+                "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/" \

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

         fi

     fi

@@ -363,7 +363,7 @@ 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/services/Cloud"

+    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 s3_materials_path "$BOTO_MATERIALS_PATH"

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

@@ -131,7 +131,7 @@ export -n SERVICE_TOKEN SERVICE_ENDPOINT OS_SERVICE_TOKEN OS_SERVICE_ENDPOINT

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

 if [[ -z $EC2_URL ]]; then

-    EC2_URL=http://localhost:8773/services/Cloud

+    EC2_URL=http://localhost:8773/

 fi

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