x
/
fuel-plugin-purestorage-cinder
Code Issues Proposed changes

Relocate common function 

Change-Id: Ie25ae0c8dce8e05b7f0f058449709309c88ff1a4
This commit is contained in:
Simon Dodsley 2016-02-16 14:46:06 -05:00
parent 822a852d8d
commit 0d24222b7f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
lib/puppet/parser/functions/get_random_id.rb → deployment_scripts/puppet/modules/plugin_purestorage_cinder/lib/puppet/parser/functions/get_random_id.rb
View File

1
deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/common.pp
View File

@ -73,4 +73,5 @@ class plugin_purestorage_cinder::common {
source => 'puppet:///modules/plugin_purestorage_cinder/multipath.conf',
require => Package[$plugin_purestorage_cinder::params::multipath_package_name],
notify => Service[$plugin_purestorage_cinder::params::multipath_package_name],
}
}

2
deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/compute.pp
View File

@ -28,7 +28,7 @@ class plugin_purestorage_cinder::compute {
hasrestart => true,
}
nova_config { 'libvirt/iscsi_use_multipath': value => $plugin_settings['pure_nova_multipath'],
nova_config { 'libvirt/iscsi_use_multipath': value => $plugin_settings['pure_nova_multipath'];
'libvirt/hw_disk_discard': value => 'unmap' }
Nova_config<||> ~> Service['nova-compute']

9
deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp
View File

@ -86,13 +86,12 @@ class plugin_purestorage_cinder::controller (
# we can just, temporarily, assign a randon ID to the two fields.
# When keystone-puppet has the functionality we need we will fix this workaround
$PROJECT_ID" = get_random_id(32)
$USER_ID" = get_random_id(32)
$PROJECT_ID = get_random_id(32)
$USER_ID = get_random_id(32)
}
cinder::backend::pure { DEFAULT :
extra_options => { "DEFAULT/cinder_internal_tenant_project_id" => { value => "$PROJECT_ID"] },
"DEFALUT/cinder_internal_tenant_user_id" => { value => "$USER_ID"] }
extra_options => { "DEFAULT/cinder_internal_tenant_project_id" => { value => "$PROJECT_ID" },
"DEFALUT/cinder_internal_tenant_user_id" => { value => "$USER_ID" }
}
}
cinder::backend::pure { $section :