Merge "Revert "ec2api: Use volumev3 instead of volumev2""

This commit is contained in:
Zuul 2021-01-30 00:18:50 +00:00 committed by Gerrit Code Review
commit 1ec6f3411d

View File

@ -31,7 +31,6 @@ class openstack_integration::ec2api {
} }
class { 'ec2api::api': class { 'ec2api::api':
keystone_ec2_tokens_url => "${::openstack_integration::config::keystone_auth_uri}/v3/ec2tokens", keystone_ec2_tokens_url => "${::openstack_integration::config::keystone_auth_uri}/v3/ec2tokens",
cinder_service_type => 'volumev3',
external_network => 'public', external_network => 'public',
} }
include ec2api::metadata include ec2api::metadata