From 6c497451e61d0700bf86b49afcc855b1492c8d3a Mon Sep 17 00:00:00 2001 From: sreesiv Date: Thu, 15 Dec 2016 21:12:35 +0530 Subject: [PATCH] Release Candidate #5 -- Fixed all puppet-lint comments, refactored associated scripts. --- cinder_nimble-1.0-1.0.0-1.noarch.rpm | Bin 22220 -> 22376 bytes .../puppet/manifests/default_type.pp | 31 ++++---------- .../puppet/manifests/disable_default_type.pp | 30 +++----------- .../puppet/manifests/hiera_override.pp | 2 +- .../manifests/backend/add_backend.pp | 9 +++++ .../check_if_default_type_is_enabled.pp | 26 ++++++++++++ .../manifests/backend/disable_default_type.pp | 12 +++--- .../manifests/backend/enable_backend.pp | 2 + .../manifests/backend/nimble.pp | 38 ++---------------- .../manifests/backend/set_default_type.pp | 14 ++++--- .../backend/set_extraspecs_encryption.pp | 2 + .../backend/set_extraspecs_multi_init.pp | 2 + .../backend/set_extraspecs_perfpol.pp | 2 + .../manifests/backend/set_nimble_backend.pp | 27 +++++++------ .../backend/set_nimble_cinder_type.pp | 2 + .../plugin_cinder_nimble/manifests/init.pp | 4 +- .../plugin_cinder_nimble/manifests/params.pp | 2 + 17 files changed, 97 insertions(+), 108 deletions(-) create mode 100644 deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/add_backend.pp create mode 100644 deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/check_if_default_type_is_enabled.pp diff --git a/cinder_nimble-1.0-1.0.0-1.noarch.rpm b/cinder_nimble-1.0-1.0.0-1.noarch.rpm index 65b7fff131ede9da371e0c0e5538b9853ad196a1..eceb3a1332d874e7a4bbeb027f5f7e3679b55acb 100644 GIT binary patch delta 15779 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 $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: } } diff --git a/deployment_scripts/puppet/manifests/disable_default_type.pp b/deployment_scripts/puppet/manifests/disable_default_type.pp index 23e039f..baf8935 100644 --- a/deployment_scripts/puppet/manifests/disable_default_type.pp +++ b/deployment_scripts/puppet/manifests/disable_default_type.pp @@ -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: } } diff --git a/deployment_scripts/puppet/manifests/hiera_override.pp b/deployment_scripts/puppet/manifests/hiera_override.pp index e6e9a3f..6b750d8 100644 --- a/deployment_scripts/puppet/manifests/hiera_override.pp +++ b/deployment_scripts/puppet/manifests/hiera_override.pp @@ -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. diff --git a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/add_backend.pp b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/add_backend.pp new file mode 100644 index 0000000..8cb1c4e --- /dev/null +++ b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/add_backend.pp @@ -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, + } +} + diff --git a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/check_if_default_type_is_enabled.pp b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/check_if_default_type_is_enabled.pp new file mode 100644 index 0000000..7030f06 --- /dev/null +++ b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/check_if_default_type_is_enabled.pp @@ -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, + } + } + } +} diff --git a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/disable_default_type.pp b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/disable_default_type.pp index 1ce0966..f55e8cb 100644 --- a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/disable_default_type.pp +++ b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/disable_default_type.pp @@ -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'] diff --git a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/enable_backend.pp b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/enable_backend.pp index bb0e87f..74cf326 100644 --- a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/enable_backend.pp +++ b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/enable_backend.pp @@ -1,3 +1,5 @@ +# enable_backend.pp + define plugin_cinder_nimble::backend::enable_backend ( $config_file = $plugin_cinder_nimble::params::config_file ) { diff --git a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/nimble.pp b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/nimble.pp index 60f3469..42fa47c 100644 --- a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/nimble.pp +++ b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/nimble.pp @@ -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: } } diff --git a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_default_type.pp b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_default_type.pp index 01d25bf..25a37af 100644 --- a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_default_type.pp +++ b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_default_type.pp @@ -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'] diff --git a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_extraspecs_encryption.pp b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_extraspecs_encryption.pp index 9424f9a..c98039b 100644 --- a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_extraspecs_encryption.pp +++ b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_extraspecs_encryption.pp @@ -1,3 +1,5 @@ +# set_extraspecs_encryption.pp + class plugin_cinder_nimble::backend::set_extraspecs_encryption ( ) { $storage_hash = hiera_hash('storage', {}) diff --git a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_extraspecs_multi_init.pp b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_extraspecs_multi_init.pp index de91c10..b7efc25 100644 --- a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_extraspecs_multi_init.pp +++ b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_extraspecs_multi_init.pp @@ -1,3 +1,5 @@ +# set_extraspecs_multi_init.pp + class plugin_cinder_nimble::backend::set_extraspecs_multi_init ( ) { $storage_hash = hiera_hash('storage', {}) diff --git a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_extraspecs_perfpol.pp b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_extraspecs_perfpol.pp index 36ec491..e2f1033 100644 --- a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_extraspecs_perfpol.pp +++ b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_extraspecs_perfpol.pp @@ -1,3 +1,5 @@ +# set_extraspecs_perfpol.pp + class plugin_cinder_nimble::backend::set_extraspecs_perfpol ( ) { $storage_hash = hiera_hash('storage', {}) diff --git a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_nimble_backend.pp b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_nimble_backend.pp index ac9aee1..5759ad0 100644 --- a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_nimble_backend.pp +++ b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_nimble_backend.pp @@ -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, } } diff --git a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_nimble_cinder_type.pp b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_nimble_cinder_type.pp index 000fd88..6209dd6 100644 --- a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_nimble_cinder_type.pp +++ b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/backend/set_nimble_cinder_type.pp @@ -1,3 +1,5 @@ +# set_nimble_cinder_type.pp + class plugin_cinder_nimble::backend::set_nimble_cinder_type ( ) { $storage_hash = hiera_hash('storage', {}) diff --git a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/init.pp b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/init.pp index e7d09c3..f40c7ea 100644 --- a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/init.pp +++ b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/init.pp @@ -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: } } diff --git a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/params.pp b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/params.pp index 5e473e8..11f7bf5 100644 --- a/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/params.pp +++ b/deployment_scripts/puppet/modules/plugin_cinder_nimble/manifests/params.pp @@ -1,3 +1,5 @@ +# params.pp + class plugin_cinder_nimble::params ( ) {