From 15dbc6ed794e897be18f7d16b435cffa43b57882 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 28 Jan 2021 01:23:19 +0000
Subject: [PATCH] Revert "ec2api: Use volumev3 instead of volumev2"

This reverts commit 01f74c0ba5f0fce1a715255e45534853ee45cc42.

Reason for revert:
Now ec2api uses volumev3 by default so we don't need to set
it explicitly.

Depends-on: https://review.opendev.org/768182

Change-Id: I486c6f66294529544f0f2469ce2436bad935e957
---
 manifests/ec2api.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifests/ec2api.pp b/manifests/ec2api.pp
index ea62a41b2..0bc42f81d 100644
--- a/manifests/ec2api.pp
+++ b/manifests/ec2api.pp
@@ -31,7 +31,6 @@ class openstack_integration::ec2api {
       }
       class { 'ec2api::api':
         keystone_ec2_tokens_url => "${::openstack_integration::config::keystone_auth_uri}/v3/ec2tokens",
-        cinder_service_type     => 'volumev3',
         external_network        => 'public',
       }
       include ec2api::metadata