Fix puppet-lint before upgrading gem
Removing puppet-lint warnings in favor of upgrading to latest gem 2016-09-13 21:09:22.008272 | manifests/api.pp:337:WARNING: line has more than 140 characters 2016-09-13 21:09:22.008403 | manifests/api.pp:410:WARNING: line has more than 140 characters 2016-09-13 21:09:22.008457 | manifests/backend/dellsc_iscsi.pp:75:WARNING: line has more than 140 characters 2016-09-13 21:09:22.008497 | manifests/backend/dellsc_iscsi.pp:79:WARNING: line has more than 140 characters 2016-09-13 21:09:22.008531 | manifests/backend/hp3par_iscsi.pp:90:WARNING: line has more than 140 characters 2016-09-13 21:09:22.008562 | manifests/backend/vmdk.pp:80:WARNING: line has more than 140 characters 2016-09-13 21:09:22.008594 | manifests/backend/vmdk.pp:84:WARNING: line has more than 140 characters 2016-09-13 21:09:22.008625 | manifests/backup/swift.pp:92:WARNING: line has more than 140 characters 2016-09-13 21:09:22.008658 | manifests/quota_set.pp:80:WARNING: line has more than 140 characters 2016-09-13 21:09:22.008693 | manifests/volume/hp3par_iscsi.pp:67:WARNING: line has more than 140 characters Change-Id: I49c51bca7beda1b278f979c97876102c682ecd8e
This commit is contained in:
Carlos Camacho
parent
d611f48bb8
commit
93ea4f61a0
|
|
@ -327,7 +327,8 @@ class cinder::api (
|
|||
# we need to make sure cinder-api/eventlet is stopped before trying to start apache
|
||||
Service['cinder-api'] -> Service[$service_name]
|
||||
} else {
|
||||
fail('Invalid service_name. Either cinder-api/openstack-cinder-api for running as a standalone service, or httpd for being run by a httpd server')
|
||||
fail('Invalid service_name. Either cinder-api/openstack-cinder-api for \
|
||||
running as a standalone service, or httpd for being run by a httpd server')
|
||||
}
|
||||
|
||||
cinder_config {
|
||||
|
|
@ -398,9 +399,12 @@ class cinder::api (
|
|||
$keystone_tenant_real = pick($keystone_tenant, $::cinder::keystone::authtoken::project_name)
|
||||
$keystone_username_real = pick($keystone_user, $::cinder::keystone::authtoken::username)
|
||||
$keystone_password_real = pick($keystone_password, $::cinder::keystone::authtoken::password)
|
||||
|
||||
$defaults = {
|
||||
'cinder-api' => {
|
||||
# lint:ignore:140chars
|
||||
'command' => "cinder --os-auth-url ${::cinder::keystone::authtoken::auth_uri} --os-project-name ${keystone_tenant_real} --os-username ${keystone_username_real} --os-password ${keystone_password_real} list",
|
||||
# lint:endignore
|
||||
}
|
||||
}
|
||||
$validation_options_hash = merge ($defaults, $validation_options)
|
||||
|
|
|
|||
|
|
@ -74,11 +74,13 @@ define cinder::backend::dellsc_iscsi (
|
|||
include ::cinder::deps
|
||||
|
||||
if $dell_sc_server_folder == 'srv' {
|
||||
warning('The OpenStack default value of dell_sc_server_folder differs from the puppet module default of "srv" and will be changed to the upstream OpenStack default in N-release.')
|
||||
warning('The OpenStack default value of dell_sc_server_folder differs from the puppet module \
|
||||
default of "srv" and will be changed to the upstream OpenStack default in N-release.')
|
||||
}
|
||||
|
||||
if $dell_sc_volume_folder == 'vol' {
|
||||
warning('The OpenStack default value of dell_sc_volume_folder differs from the puppet module default of "vol" and will be changed to the upstream OpenStack default in N-release.')
|
||||
warning('The OpenStack default value of dell_sc_volume_folder differs from the puppet module \
|
||||
default of "vol" and will be changed to the upstream OpenStack default in N-release.')
|
||||
}
|
||||
|
||||
$driver = 'dell.dell_storagecenter_iscsi.DellStorageCenterISCSIDriver'
|
||||
|
|
|
|||
|
|
@ -89,7 +89,8 @@ define cinder::backend::hp3par_iscsi(
|
|||
fail ('hp3par_snapshot_expiration must be greater than hp3par_snapshot_retention')
|
||||
}
|
||||
|
||||
warning('The define cinder::backend::hp3par_iscsi is deprecated and will be removed after Newton cycle, pleasse use the new define cinder::backend::hpe3par_iscsi.')
|
||||
warning('The define cinder::backend::hp3par_iscsi is deprecated and will be \
|
||||
removed after Newton cycle, pleasse use the new define cinder::backend::hpe3par_iscsi.')
|
||||
|
||||
cinder_config {
|
||||
"${name}/volume_backend_name": value => $volume_backend_name;
|
||||
|
|
|
|||
|
|
@ -79,11 +79,13 @@ define cinder::backend::vmdk (
|
|||
include ::cinder::deps
|
||||
|
||||
if $volume_folder == 'cinder-volumes' {
|
||||
warning('The OpenStack default value of volume_folder differs from the puppet module default of "cinder-volumes" and will be changed to the upstream OpenStack default in N-release.')
|
||||
warning('The OpenStack default value of volume_folder differs from the puppet module \
|
||||
default of "cinder-volumes" and will be changed to the upstream OpenStack default in N-release.')
|
||||
}
|
||||
|
||||
if $task_poll_interval == 5 {
|
||||
warning('The OpenStack default value of task_poll_interval differs from the puppet module default of "5" and will be changed to the upstream OpenStack default in N-release.')
|
||||
warning('The OpenStack default value of task_poll_interval differs from the puppet \
|
||||
module default of "5" and will be changed to the upstream OpenStack default in N-release.')
|
||||
}
|
||||
|
||||
cinder_config {
|
||||
|
|
|
|||
|
|
@ -91,7 +91,8 @@ class cinder::backup::swift (
|
|||
include ::cinder::deps
|
||||
|
||||
if ($backup_swift_container == 'volumes_backup') {
|
||||
warning('The OpenStack default value of backup_swift_container differs from the puppet module default of "volumes_backup" and will be changed to the upstream OpenStack default in N-release.')
|
||||
warning('The OpenStack default value of backup_swift_container differs from the puppet module \
|
||||
default of "volumes_backup" and will be changed to the upstream OpenStack default in N-release.')
|
||||
}
|
||||
|
||||
cinder_config {
|
||||
|
|
|
|||
|
|
@ -79,7 +79,9 @@ define cinder::quota_set (
|
|||
}
|
||||
|
||||
exec {"cinder quota-class-update ${class_name}":
|
||||
# lint:ignore:140chars
|
||||
command => "cinder quota-class-update ${class_name} --volumes ${quota_volumes} --snapshots ${quota_snapshots} --gigabytes ${quota_gigabytes} --volume-type '${volume_type}'",
|
||||
# lint:endignore
|
||||
onlyif => 'cinder quota-class-show default | grep -qP -- -1',
|
||||
environment => $cinder_env,
|
||||
require => Anchor['cinder-support-package'],
|
||||
|
|
|
|||
|
|
@ -66,7 +66,8 @@ class cinder::volume::hp3par_iscsi(
|
|||
|
||||
include ::cinder::deps
|
||||
|
||||
warning('The class cinder::volume::hp3par_iscsi is deprecated and will be removed after Newton cycle, pleasse use the new class cinder::volume::hpe3par_iscsi.')
|
||||
warning('The class cinder::volume::hp3par_iscsi is deprecated and will be removed \
|
||||
after Newton cycle, pleasse use the new class cinder::volume::hpe3par_iscsi.')
|
||||
|
||||
cinder::backend::hpe3par_iscsi { 'DEFAULT':
|
||||
volume_driver => $volume_driver,
|
||||
|
|
|
|||
Loading…
Reference in New Issue