openstack/puppet-manila
Code Issues Proposed changes

add generic driver support

Browse Source
This commit is contained in:
Ryan Hefner 2014-07-28 17:26:02 -04:00
parent 11a9b08259
commit 9164eada05
2 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
manifests/backend/generic.pp
View File

@ -5,7 +5,56 @@
# (optional) Allows for the share_backend_name to be separate of $name.
# Defaults to: $name
#
# [*service_image_name*]
# (optional) Name of image in glance, that will be used to create
# service instance.
#
# [*service_instance_name_template*]
# (optional) Name of service instance.
#
# [*service_instance_user*]
# (optional) User in service instance.
#
# [*service_instance_password*]
# (optional) Password to service instance user.
#
# [*manila_service_keypair_name*]
# (optional) Name of keypair that will be created and used
# for service instance.
#
# [*path_to_public_key*]
# (optional) Path to hosts public key.
#
# [*path_to_private_key*]
# (optional) Path to hosts private key.
#
# [*max_time_to_build_instance*]
# (optional) Maximum time to wait for creating service instance.
#
# [*service_instance_security_group*]
# (optional) Name of security group, that will be used for
# service instance creation.
#
# [*service_instance_flavor_id*]
# (optional) ID of flavor, that will be used for service instance
# creation.
#
# [*service_network_name*]
# (optional) Name of manila service network.
#
# [*service_network_cidr*]
# (optional) CIDR of manila service network.
#
# [*service_network_division_mask*]
# (optional) This mask is used for dividing service network into
# subnets, ip capacity of subnet with this mask directly
# defines possible amount of created service VMs
# per tenant's subnet.
#
# [*interface_driver*]
# (optional) Vif driver.
#
define manila::backend::generic (
$share_backend_name = $name,
$service_image_name = 'manila-service-image',
@ -20,14 +69,15 @@ define manila::backend::generic (
$service_instance_flavor_id = 100,
$service_network_name = 'manila_service_network',
$service_network_cidr = '10.254.0.0/16',
$service_network_division_mask = 28,
$interface_driver = 'manila.network.linux.interface.OVSInterfaceDriver',
$os_region_name = undef,
) {
manila_config {
"${name}/share_backend_name": value => $share_backend_name;
"${name}/share_driver": value =>
'manila.share.drivers.generic.GenericShareDriver';
"${name}/share_backend_name": value => $share_backend_name;
"${name}/share_driver": value =>
'manila.share.drivers.generic.GenericShareDriver';
"${name}/service_image_name": value => $service_image_name;
"${name}/service_instance_name_template": value => $service_instance_name_template;
"${name}/service_instance_user": value => $service_instance_user;
@ -40,6 +90,8 @@ define manila::backend::generic (
"${name}/service_instance_flavor_id": value => $service_instance_flavor_id;
"${name}/service_network_name": value => $service_network_name;
"${name}/service_network_cidr": value => $service_network_cidr;
"${name}/service_network_division_mask": value => $service_network_division_mask;
"${name}/interface_driver": value => $interface_driver;
"${name}/os_region_name": value => $os_region_name;
}
}

2
manifests/share/generic.pp
View File

@ -13,6 +13,7 @@ class manila::share::generic (
$service_network_name = 'manila_service_network',
$service_network_cidr = '10.254.0.0/16',
$interface_driver = 'manila.network.linux.interface.OVSInterfaceDriver',
$os_region_name = undef,
) {
manila::backend::generic { 'DEFAULT':
@ -29,5 +30,6 @@ class manila::share::generic (
service_network_name => $service_network_name,
service_network_cidr => $service_network_cidr,
interface_driver => $interface_driver,
os_region_name => $os_region_name,
}
}