x
/
fuel-plugin-manila
Code Issues Proposed changes

multiple improvement for generic driver 

Change-Id: I3fa289bbcdde897ec6dd2d06d1100718c5d416fc
This commit is contained in:
Igor Gajsin 2016-08-05 20:03:01 +03:00
parent d39f6a404b
commit 985756f14f
5 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment_scripts/puppet/manifests/install.pp
View File

@ -50,4 +50,6 @@ class {'::manila_auxiliary::image':
image => $image,
}
class {'::manila_auxiliary::ssh_keygen': }
Package['python-pip']->Package['pycrypto']->Package['python-manila']->Package['python-manilaclient']->Package['python-manila-ui']

14
deployment_scripts/puppet/manifests/site.pp
View File

@ -20,6 +20,8 @@ $db_pass = $manila['db_password']
$db_host = hiera('database_vip')
$sql_conn = "mysql+pymysql://${db_user}:${db_pass}@${db_host}/manila?charset=utf8"
$image = $manila['service_vm_image']['img_name']
$rabbit_hash = hiera_hash('rabbit', {})
$amqp_user = $rabbit_hash['user']
$amqp_password = $rabbit_hash['password']
@ -78,12 +80,18 @@ class {'::manila::backends':
}
$gen = {'generic' =>
{'share_backend_name' => 'generic',
{'share_backend_name' => 'generic',
'driver_handles_share_servers' => 'true',
'share_driver' => 'manila.share.drivers.generic.GenericShareDriver',
'service_instance_user' => 'manila',
'service_instance_password' => 'manila',
'service_image_name' => $image,
'path_to_private_key' => '/root/.ssh/id_rsa',
'path_to_public_key' => '/root/.ssh/id_rsa.pub',
}
}
create_resources('::manila::backend::generic', $gen)
create_resources('::manila_auxiliary::backend::generic', $gen)
exec { 'manual_db_sync':
command => $::manila::params::db_sync_command,
@ -110,3 +118,5 @@ class {'::manila::share':
enabled => true,
manage_service => true,
}
class {'::manila_auxiliary::data': }

21
deployment_scripts/puppet/modules/manila_auxiliary/manifests/backend/generic.pp Normal file
View File

@ -0,0 +1,21 @@
define manila_auxiliary::backend::generic (
$share_driver = 'manila.share.drivers.generic.GenericShareDriver',
$driver_handles_share_servers = 'True',
$service_instance_user = 'manila',
$service_instance_password = 'manila',
$service_image_name = 'manila-service-image',
$path_to_private_key = '/root/.ssh/id_rsa',
$path_to_public_key = '/root/.ssh/id_rsa.pub',
$share_backend_name = $name,
) {
manila_config {
"${name}/share_driver": value => $share_driver;
"${name}/driver_handles_share_servers": value => $driver_handles_share_servers;
"${name}/service_instance_user": value => $service_instance_user;
"${name}/service_instance_password": value => $service_instance_password;
"${name}/service_image_name": value => $service_image_name;
"${name}/path_to_private_key": value => $path_to_private_key;
"${name}/path_to_public_key": value => $path_to_public_key;
"${name}/share_backend_name": value => $share_backend_name;
}
}

6
deployment_scripts/puppet/modules/manila_auxiliary/manifests/data.pp Normal file
View File

@ -0,0 +1,6 @@
class manila_auxiliary::data () {
service {'manila-data':
ensure => ''running,
name => 'manila-data',
}
}

10
deployment_scripts/puppet/modules/manila_auxiliary/manifests/ssh_keygen.pp Normal file
View File

@ -0,0 +1,10 @@
class manila_auxiliary::ssh_keygen (
$name = '/root/.ssh/id_rsa',
$user = 'root',
) {
exec {'manila_ssh_keygen':
command => "ssh-keygen -t rsa -f ${name} -N ''",
user => $user,
path => '/bin:/usr/bin',
}
}