@@ -349,18 +349,12 @@ function create_cinder_accounts {

         # block-storage is the official service type

         get_or_create_service "cinder" "block-storage" "Cinder Volume Service"

-        get_or_create_service "cinder" "volume" "Cinder Volume Service"

         if [ "$CINDER_USE_MOD_WSGI" == "False" ]; then

             get_or_create_endpoint \

                 "block-storage" \

                 "$REGION_NAME" \

                 "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v3/\$(project_id)s"

-            get_or_create_endpoint \

-                "volume" \

-                "$REGION_NAME" \

-                "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/\$(project_id)s"

-

             get_or_create_service "cinderv2" "volumev2" "Cinder Volume Service V2"

             get_or_create_endpoint \

                 "volumev2" \

@@ -378,11 +372,6 @@ function create_cinder_accounts {

                 "$REGION_NAME" \

                 "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST/volume/v3/\$(project_id)s"

-            get_or_create_endpoint \

-                "volume" \

-                "$REGION_NAME" \

-                "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST/volume/v1/\$(project_id)s"

-

             get_or_create_service "cinderv2" "volumev2" "Cinder Volume Service V2"

             get_or_create_endpoint \

                 "volumev2" \