@@ -126,12 +126,12 @@ fi

 export -n SERVICE_TOKEN SERVICE_ENDPOINT OS_SERVICE_TOKEN OS_SERVICE_ENDPOINT

-EC2_URL=`openstack endpoint show ec2 | grep " ec2.publicURL " | cut -d " " -f4`

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

 if [[ -z $EC2_URL ]]; then

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

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

 fi

-S3_URL=`openstack endpoint show s3 | grep " s3.publicURL " | cut -d " " -f4`

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

 if [[ -z $S3_URL ]]; then

     S3_URL=http://localhost:3333

 fi