openstack/puppet-manila
Code Issues Proposed changes

Add Puppet 4.x lint checks

Browse Source 
- This changes the puppet-lint requirement to 1.1.x, so that we can use
  puppet-lint plugins. Most of these plugins are for 4.x compat, but some just
  catch common errors.

Change-Id: Ie7e1f8b4d4cdd5d058b95cdf2c29c80dc73b954c
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
This commit is contained in:
Gael Chamoulaud 2015-03-02 15:16:22 +01:00
parent 46ba0607b6
commit a0951a2b6c
11 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Gemfile
View File

@ -2,9 +2,21 @@ source 'https://rubygems.org'
group :development, :test do
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', '~> 0.3.2'
gem 'rspec-puppet', '~> 1.0.1'
gem 'rake', '10.1.1'
gem 'puppet-lint', '~> 1.1'
gem 'metadata-json-lint'
gem 'puppet-lint-absolute_classname-check'
gem 'puppet-lint-absolute_template_path'
gem 'puppet-lint-trailing_newline-check'
# Puppet 4.x related lint checks
gem 'puppet-lint-unquoted_string-check'
gem 'puppet-lint-leading_zero-check'
gem 'puppet-lint-variable_contains_upcase'
gem 'puppet-lint-numericvariable'
end
if puppetversion = ENV['PUPPET_GEM_VERSION']

8
manifests/api.pp
View File

@ -93,7 +93,7 @@ class manila::api (
'manila.api.v1.limits:RateLimitingMiddleware.factory'
) {
include manila::params
include ::manila::params
Manila_config<||> ~> Service['manila-api']
Manila_api_paste_ini<||> ~> Service['manila-api']
@ -103,8 +103,8 @@ class manila::api (
Package['manila-api'] -> Manila_api_paste_ini<||>
Package['manila-api'] -> Service['manila-api']
package { 'manila-api':
ensure => $package_ensure,
name => $::manila::params::api_package,
ensure => $package_ensure,
name => $::manila::params::api_package,
}
}
@ -138,7 +138,7 @@ class manila::api (
}
manila_config {
'DEFAULT/osapi_share_listen': value => $bind_host
'DEFAULT/osapi_share_listen': value => $bind_host,
}
if $os_region_name {

2
manifests/client.pp
View File

@ -11,7 +11,7 @@ class manila::client(
$package_ensure = 'present'
) {
include manila::params
include ::manila::params
package { 'python-manilaclient':
ensure => $package_ensure,

2
manifests/db/sync.pp
View File

@ -1,7 +1,7 @@
#
class manila::db::sync {
include manila::params
include ::manila::params
exec { 'manila-manage db_sync':
command => $::manila::params::db_sync_command,

2
manifests/init.pp
View File

@ -118,7 +118,7 @@ class manila (
$rootwrap_config = '/etc/manila/rootwrap.conf',
) {
include manila::params
include ::manila::params
Package['manila'] -> Manila_config<||>
Package['manila'] -> Manila_api_paste_ini<||>

4
manifests/qpid.pp
View File

@ -28,8 +28,8 @@ class manila::qpid(
$service_ensure = 'stopped'
}
class { 'qpid::server':
service_ensure => $service_ensure
class { '::qpid::server':
service_ensure => $service_ensure,
}
}

2
manifests/scheduler.pp
View File

@ -6,7 +6,7 @@ class manila::scheduler (
$manage_service = true
) {
include manila::params
include ::manila::params
Manila_config<||> ~> Service['manila-scheduler']
Manila_api_paste_ini<||> ~> Service['manila-scheduler']

2
manifests/share.pp
View File

@ -5,7 +5,7 @@ class manila::share (
$manage_service = true
) {
include manila::params
include ::manila::params
Manila_config<||> ~> Service['manila-share']
Manila_api_paste_ini<||> ~> Service['manila-share']

18
manifests/share/generic.pp
View File

@ -56,14 +56,14 @@ class manila::share::generic (
) {
manila::backend::generic { 'DEFAULT':
smb_template_config_path => $smb_template_config_path,
volume_name_template => $volume_name_template,
volume_snapshot_name_template => $volume_snapshot_name_template,
share_mount_path => $share_mount_path,
max_time_to_create_volume => $max_time_to_create_volume,
max_time_to_attach => $max_time_to_attach,
service_instance_smb_config_path => $service_instance_smb_config_path,
share_helpers => $share_helpers,
share_volume_fstype => $share_volume_fstype,
smb_template_config_path => $smb_template_config_path,
volume_name_template => $volume_name_template,
volume_snapshot_name_template => $volume_snapshot_name_template,
share_mount_path => $share_mount_path,
max_time_to_create_volume => $max_time_to_create_volume,
max_time_to_attach => $max_time_to_attach,
service_instance_smb_config_path => $service_instance_smb_config_path,
share_helpers => $share_helpers,
share_volume_fstype => $share_volume_fstype,
}
}

20
manifests/share/netapp.pp
View File

@ -64,15 +64,15 @@ class manila::share::netapp (
) {
manila::backend::netapp { 'DEFAULT':
netapp_nas_transport_type => $netapp_nas_transport_type,
netapp_nas_login => $netapp_nas_login,
netapp_nas_password => $netapp_nas_password,
netapp_nas_server_hostname => $netapp_nas_server_hostname,
netapp_nas_volume_name_template => $netapp_nas_volume_name_template,
netapp_vserver_name_template => $netapp_vserver_name_template,
netapp_lif_name_template => $netapp_lif_name_template,
netapp_aggregate_name_search_pattern => $netapp_aggregate_name_search_pattern,
netapp_root_volume_aggregate => $netapp_root_volume_aggregate,
netapp_root_volume_name => $netapp_root_volume_name,
netapp_nas_transport_type => $netapp_nas_transport_type,
netapp_nas_login => $netapp_nas_login,
netapp_nas_password => $netapp_nas_password,
netapp_nas_server_hostname => $netapp_nas_server_hostname,
netapp_nas_volume_name_template => $netapp_nas_volume_name_template,
netapp_vserver_name_template => $netapp_vserver_name_template,
netapp_lif_name_template => $netapp_lif_name_template,
netapp_aggregate_name_search_pattern => $netapp_aggregate_name_search_pattern,
netapp_root_volume_aggregate => $netapp_root_volume_aggregate,
netapp_root_volume_name => $netapp_root_volume_name,
}
}

14
manifests/type.pp
View File

@ -69,13 +69,13 @@ define manila::type (
if ($set_value and $set_key) {
Exec["manila type-create ${volume_name}"] ->
manila::type_set { $set_value:
type => $volume_name,
key => $set_key,
os_password => $os_password,
os_tenant_name => $os_tenant_name,
os_username => $os_username,
os_auth_url => $os_auth_url,
os_region_name => $os_region_name,
type => $volume_name,
key => $set_key,
os_password => $os_password,
os_tenant_name => $os_tenant_name,
os_username => $os_username,
os_auth_url => $os_auth_url,
os_region_name => $os_region_name,
}
}
}