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

Release Candidate #5 -- Fixed all puppet-lint comments, refactored associated scripts.

This commit is contained in:
sreesiv 2016-12-15 21:12:35 +05:30
parent c8e8c39221
commit 6c497451e6
17 changed files with 97 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
cinder_nimble-1.0-1.0.0-1.noarch.rpm
View File

Binary file not shown.

31
deployment_scripts/puppet/manifests/default_type.pp
View File

@ -3,37 +3,20 @@ notice('MODULAR: nimble-default-volume-type')
$config_file = '/etc/cinder/cinder.conf'
$cinder_nimble = hiera_hash('cinder_nimble', {})
define plugin_cinder_nimble::check_if_default_backend_is_enabled (
) {
if (($cinder_nimble["nimble${name}_default_backend"]) == true) and
(($cinder_nimble["nimble${name}_backend_type"]) != '') {
class { 'plugin_cinder_nimble::backend::set_default_type' :
config_file => $config_file,
nimble_backend_type => $cinder_nimble["nimble${name}_backend_type"],
}
}
}
if ($cinder_nimble['nimble_grouping']) == true {
if (($cinder_nimble['nimble_group_default_backend']) == true) and
(($cinder_nimble["nimble_group_backend_type"]) != '') {
(($cinder_nimble['nimble_group_backend_type']) != '') {
class { 'plugin_cinder_nimble::backend::set_default_type' :
config_file => $config_file,
config_file => $config_file,
nimble_backend_type => $cinder_nimble['nimble_group_backend_type'],
}
}
}
else {
# Should work from Puppet >= 4.0.0 onwards which has Future parser
/*
range("1", "$cinder_nimble['no_backends']").each |Integer $index, String $value| {
if ($cinder_nimble["nimble${value}_default_backend"]) == true {
$nimble_default_type = $cinder_nimble["nimble${value}_backend_type"]
$nimble_default_type_set = true
}
$range_array = range('1', $cinder_nimble['no_backends'])
plugin_cinder_nimble::backend::check_if_default_type_is_enabled { $range_array:
enable => true,
cinder_nimble => $cinder_nimble,
config_file => $config_file
}
*/
$range_array = range("1", $cinder_nimble['no_backends'])
plugin_cinder_nimble::check_if_default_backend_is_enabled { $range_array: }
}

30
deployment_scripts/puppet/manifests/disable_default_type.pp
View File

@ -1,39 +1,21 @@
notice('MODULAR: nimble-disable-default-volume-type')
include plugin_cinder_nimble::params
include cinder::params
$config_file = '/etc/cinder/cinder.conf'
$cinder_nimble = hiera_hash('cinder_nimble', {})
define plugin_cinder_nimble::check_if_default_type_is_enabled (
) {
if (($cinder_nimble["nimble${name}_default_backend"]) == true) and
(($cinder_nimble["nimble${name}_backend_type"]) != '') {
class { 'plugin_cinder_nimble::backend::disable_default_type' :
config_file => $config_file,
}
}
}
if ($cinder_nimble['nimble_grouping']) == true {
if (($cinder_nimble['nimble_group_default_backend']) == true) and
(($cinder_nimble["nimble_group_backend_type"]) != '') {
(($cinder_nimble['nimble_group_backend_type']) != '') {
class { 'plugin_cinder_nimble::backend::disable_default_type' :
config_file => $config_file,
}
}
}
else {
# Should work from Puppet >= 4.0.0 onwards which has Future parser
/*
range("1", "$cinder_nimble['no_backends']").each |Integer $index, String $value| {
if ($cinder_nimble["nimble${value}_default_backend"]) == true {
$nimble_default_type_set = true
}
$range_array = range('1', $cinder_nimble['no_backends'])
plugin_cinder_nimble::backend::check_if_default_type_is_enabled { $range_array:
enable => false,
cinder_nimble => $cinder_nimble,
config_file => $config_file
}
*/
$range_array = range("1", $cinder_nimble['no_backends'])
plugin_cinder_nimble::check_if_default_type_is_enabled { $range_array: }
}

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

@ -13,7 +13,7 @@ file { $hiera_dir:
ensure => directory,
}
$range_array = range("1", $no_backends)
$range_array = range('1', $no_backends)
# Create content based on grouping flag.
# This is separated to keep the inline content and conditions tidy.

9
deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/add_backend.pp Normal file
View File

@ -0,0 +1,9 @@
# add_backend.pp
define plugin_cinder_nimble::backend::add_backend (
) {
plugin_cinder_nimble::backend::set_nimble_backend { $name :
backend_id => $name,
}
}

26
deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/check_if_default_type_is_enabled.pp Normal file
View File

@ -0,0 +1,26 @@
# check_if_default_type_is_enabled.pp
define plugin_cinder_nimble::backend::check_if_default_type_is_enabled (
$enable,
$cinder_nimble = $plugin_cinder_nimble::params::cinder_nimble,
$config_file = $plugin_cinder_nimble::params::config_file
) {
include plugin_cinder_nimble::params
include cinder::params
if (($cinder_nimble["nimble${name}_default_backend"]) == true) and
(($cinder_nimble["nimble${name}_backend_type"]) != '') {
if ($enable) == true {
class { 'plugin_cinder_nimble::backend::set_default_type' :
config_file => $config_file,
nimble_backend_type => $cinder_nimble["nimble${name}_backend_type"],
}
}
else {
class { 'plugin_cinder_nimble::backend::disable_default_type' :
config_file => $config_file,
}
}
}
}

12
deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/disable_default_type.pp
View File

@ -1,3 +1,5 @@
# disable_default_type.pp
class plugin_cinder_nimble::backend::disable_default_type (
$config_file,
) {
@ -5,11 +7,11 @@ class plugin_cinder_nimble::backend::disable_default_type (
include plugin_cinder_nimble::params
include cinder::params
ini_setting {"disable_default_type_${nimble_backend_type}":
ensure => absent,
section => 'DEFAULT',
path => $config_file,
setting => 'default_volume_type',
ini_setting {'disable_default_type':
ensure => absent,
section => 'DEFAULT',
path => $config_file,
setting => 'default_volume_type',
}
Cinder_config<||> ~> Service['cinder-api']

2
deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/enable_backend.pp
View File

@ -1,3 +1,5 @@
# enable_backend.pp
define plugin_cinder_nimble::backend::enable_backend (
$config_file = $plugin_cinder_nimble::params::config_file
) {

38
deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/nimble.pp
View File

@ -1,42 +1,12 @@
# nimble.pp
class plugin_cinder_nimble::backend::nimble (
$cinder_nimble = $plugin_cinder_nimble::params::cinder_nimble
) {
include cinder::params
define plugin_cinder_nimble::add_backend (
$array, # pass the original $name
) {
#notice(inline_template('NAME: <%= name.inspect %>'))
# build a unique name...
$length = inline_template('<%= array.length %>')
$ulength = inline_template('<%= array.uniq.length %>')
if ( "${length}" != '0' ) and ( "${length}" != "${ulength}" ) {
fail('Array must not have duplicates.')
}
# if array had duplicates, this wouldn't be a unique index
$index = inline_template('<%= array.index(name) %>')
plugin_cinder_nimble::backend::set_nimble_backend { "$index" :
backend_id => $name,
index => "$index",
}
}
# Should work from Puppet >= 4.0.0 onwards which has Future parser
/*
range("1", "$cinder_nimble['no_backends']").each |$id| {
# Set backend details
class { 'plugin_cinder_nimble::backend::set_nimble_backend' :
$backend_id => $id,
}
}
*/
$range_array = range("1", $cinder_nimble['no_backends'])
plugin_cinder_nimble::add_backend { $range_array:
array => $range_array,
}
$range_array = range('1', $cinder_nimble['no_backends'])
plugin_cinder_nimble::backend::add_backend { $range_array: }
service { $cinder::params::volume_service: }
}

14
deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_default_type.pp
View File

@ -1,3 +1,5 @@
# set_default_type.pp
class plugin_cinder_nimble::backend::set_default_type (
$config_file,
$nimble_backend_type
@ -7,12 +9,12 @@ class plugin_cinder_nimble::backend::set_default_type (
include cinder::params
ini_subsetting {"set_default_type_${nimble_backend_type}":
ensure => present,
section => 'DEFAULT',
key_val_separator => '=',
path => $config_file,
setting => 'default_volume_type',
subsetting => $nimble_backend_type,
ensure => present,
section => 'DEFAULT',
key_val_separator => '=',
path => $config_file,
setting => 'default_volume_type',
subsetting => $nimble_backend_type,
}
Cinder_config<||> ~> Service['cinder-api']

2
deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_extraspecs_encryption.pp
View File

@ -1,3 +1,5 @@
# set_extraspecs_encryption.pp
class plugin_cinder_nimble::backend::set_extraspecs_encryption (
) {
$storage_hash = hiera_hash('storage', {})

2
deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_extraspecs_multi_init.pp
View File

@ -1,3 +1,5 @@
# set_extraspecs_multi_init.pp
class plugin_cinder_nimble::backend::set_extraspecs_multi_init (
) {
$storage_hash = hiera_hash('storage', {})

2
deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_extraspecs_perfpol.pp
View File

@ -1,3 +1,5 @@
# set_extraspecs_perfpol.pp
class plugin_cinder_nimble::backend::set_extraspecs_perfpol (
) {
$storage_hash = hiera_hash('storage', {})

27
deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_nimble_backend.pp
View File

@ -1,6 +1,7 @@
# set_nimble_backend.pp
define plugin_cinder_nimble::backend::set_nimble_backend (
$backend_id,
$index,
$cinder_nimble = $plugin_cinder_nimble::params::cinder_nimble,
$config_file = $plugin_cinder_nimble::params::config_file
) {
@ -35,16 +36,16 @@ define plugin_cinder_nimble::backend::set_nimble_backend (
else {
$nimble_backend_name = "${nimble_group_backend_name}_${backend_id}"
}
$nimble_volume_backend_name = "${nimble_group_backend_name}"
$nimble_volume_backend_name = $nimble_group_backend_name
}
else {
if ($cinder_nimble["nimble${backend_id}_cinder_service_name"]) != '' {
$nimble_backend_name = $cinder_nimble["nimble${backend_id}_cinder_service_name"]
}
else {
$nimble_backend_name = "${cinder_nimble["nimble${backend_id}_backend_name"]}"
$nimble_backend_name = $cinder_nimble["nimble${backend_id}_backend_name"]
}
$nimble_volume_backend_name = "${cinder_nimble["nimble${backend_id}_backend_name"]}"
$nimble_volume_backend_name = $cinder_nimble["nimble${backend_id}_backend_name"]
}
# Pool name selection
if ($cinder_nimble["nimble${backend_id}_pool_name"]) != '' {
@ -58,23 +59,23 @@ define plugin_cinder_nimble::backend::set_nimble_backend (
Cinder_config <||> ~> Service <||>
cinder_config {
"$nimble_backend_name/volume_backend_name": value => $nimble_volume_backend_name;
"$nimble_backend_name/volume_driver": value => $nimble_cinder_driver;
"$nimble_backend_name/san_ip": value => $cinder_nimble["nimble${backend_id}_san_ip"];
"$nimble_backend_name/san_login": value => $cinder_nimble["nimble${backend_id}_login"];
"$nimble_backend_name/san_password": value => $nimble_password;
"$nimble_backend_name/nimble_pool_name": value => $nimble_pool_name;
"$nimble_backend_name/use_multipath_for_image_xfer": value => $cinder_nimble["nimble${backend_id}_mp_img_xfer"];
"${nimble_backend_name}/volume_backend_name": value => $nimble_volume_backend_name;
"${nimble_backend_name}/volume_driver": value => $nimble_cinder_driver;
"${nimble_backend_name}/san_ip": value => $cinder_nimble["nimble${backend_id}_san_ip"];
"${nimble_backend_name}/san_login": value => $cinder_nimble["nimble${backend_id}_login"];
"${nimble_backend_name}/san_password": value => $nimble_password;
"${nimble_backend_name}/nimble_pool_name": value => $nimble_pool_name;
"${nimble_backend_name}/use_multipath_for_image_xfer": value => $cinder_nimble["nimble${backend_id}_mp_img_xfer"];
}
# nimble_subnet_label enabled only when iSCSI and non-nil!
if (($cinder_nimble["nimble${backend_id}_subnet_label"]) != '') and (($cinder_nimble["nimble${backend_id}_backend_protocol"]) == 'iSCSI'){
cinder_config { "$nimble_backend_name/nimble_subnet_label":
cinder_config { "${nimble_backend_name}/nimble_subnet_label":
value => $cinder_nimble["nimble${backend_id}_subnet_label"],
}
}
else {
cinder_config { "$nimble_backend_name/nimble_subnet_label":
cinder_config { "${nimble_backend_name}/nimble_subnet_label":
ensure => absent,
}
}

2
deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_nimble_cinder_type.pp
View File

@ -1,3 +1,5 @@
# set_nimble_cinder_type.pp
class plugin_cinder_nimble::backend::set_nimble_cinder_type (
) {
$storage_hash = hiera_hash('storage', {})

4
deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/init.pp
View File

@ -1,5 +1,7 @@
# init.pp
class plugin_cinder_nimble (
) inherits plugin_cinder_nimble::params {
class { $nimble_backend_class: }
class { $plugin_cinder_nimble::params::nimble_backend_class: }
}

2
deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/params.pp
View File

@ -1,3 +1,5 @@
# params.pp
class plugin_cinder_nimble::params (
) {