Merge "manila: Enable shared-file-system service type"
This commit is contained in:
@@ -36,12 +36,11 @@ class openstack_integration::manila (
|
||||
host => $openstack_integration::config::host,
|
||||
}
|
||||
class { 'manila::keystone::auth':
|
||||
configure_endpoint => false,
|
||||
public_url_v2 => "${openstack_integration::config::base_url}:8786/v2",
|
||||
internal_url_v2 => "${openstack_integration::config::base_url}:8786/v2",
|
||||
admin_url_v2 => "${openstack_integration::config::base_url}:8786/v2",
|
||||
roles => ['admin', 'service'],
|
||||
password => 'a_big_secret',
|
||||
public_url_v2 => "${openstack_integration::config::base_url}:8786/v2",
|
||||
internal_url_v2 => "${openstack_integration::config::base_url}:8786/v2",
|
||||
admin_url_v2 => "${openstack_integration::config::base_url}:8786/v2",
|
||||
roles => ['admin', 'service'],
|
||||
password => 'a_big_secret',
|
||||
}
|
||||
class { 'manila::logging':
|
||||
debug => true,
|
||||
|
||||
@@ -367,7 +367,8 @@ class openstack_integration::tempest (
|
||||
baremetal_driver => 'fake-hardware',
|
||||
baremetal_enabled_hardware_types => ['ipmi', 'fake-hardware'],
|
||||
load_balancer_test_with_noop => true,
|
||||
share_catalog_type => 'sharev2',
|
||||
# TODO(tkajinam): Remove this once new manila-tempest-plugin is available
|
||||
share_catalog_type => 'shared-file-system',
|
||||
share_multitenancy_enabled => false,
|
||||
share_enable_protocols => [downcase($share_protocol)],
|
||||
share_capability_storage_protocol => $share_protocol,
|
||||
|
||||
Reference in New Issue
Block a user