Prepare for new lint plugins
This fixes a few lint warnings/errors detected by the following plugins we aim to enable soon. - puppet-lint-file_ensure-check - puppet-lint-trailing_comma-check - puppet-lint-topscope-variable-check Change-Id: I6f4f9d36a538dec703b5a58ae50b2a0cb29a75ee Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
6 changed files with 14 additions and 14 deletions
@@ -318,13 +318,13 @@ define oslo::cache(
'dogpile.cache.pylibmc': {
stdlib::ensure_packages('python-pylibmc', {
ensure => $package_ensure,
name => $::oslo::params::pylibmc_package_name,
name => $oslo::params::pylibmc_package_name,
tag => 'openstack',
})
}
'dogpile.cache.bmemcached':{
stdlib::ensure_packages('python-binary-memcached', {
name => $::oslo::params::python_bmemcached_package_name,
name => $oslo::params::python_bmemcached_package_name,
ensure => $package_ensure,
tag => ['openstack'],
})
@@ -332,27 +332,27 @@ define oslo::cache(
'dogpile.cache.memcached','oslo_cache.memcache_pool':{
stdlib::ensure_packages('python-memcache', {
ensure => $package_ensure,
name => $::oslo::params::python_memcache_package_name,
name => $oslo::params::python_memcache_package_name,
tag => ['openstack'],
})
}
'dogpile.cache.pymemcache':{
stdlib::ensure_packages('python-pymemcache', {
ensure => $package_ensure,
name => $::oslo::params::python_pymemcache_package_name,
name => $oslo::params::python_pymemcache_package_name,
tag => ['openstack'],
})
}
'dogpile.cache.redis','dogpile.cache.redis_sentinel':{
stdlib::ensure_packages('python-redis', {
name => $::oslo::params::python_redis_package_name,
name => $oslo::params::python_redis_package_name,
ensure => $package_ensure,
tag => ['openstack'],
})
}
'oslo_cache.etcd3gw':{
stdlib::ensure_packages('python-etcd3gw', {
name => $::oslo::params::python_etcd3gw_package_name,
name => $oslo::params::python_etcd3gw_package_name,
ensure => $package_ensure,
tag => 'openstack',
})
@@ -23,7 +23,7 @@ define oslo::concurrency(
){
$concurrency_options = {
'oslo_concurrency/disable_process_locking' => { value => $disable_process_locking },
'oslo_concurrency/lock_path'=>{ value => $lock_path }
'oslo_concurrency/lock_path'=>{ value => $lock_path },
}
create_resources($name,$concurrency_options)
@@ -33,28 +33,28 @@ define oslo::coordination (
case $backend_url {
/^redis:\/\//: {
stdlib::ensure_packages('python-redis', {
name => $::oslo::params::python_redis_package_name,
name => $oslo::params::python_redis_package_name,
ensure => $package_ensure,
tag => ['openstack'],
})
}
/^etcd3\+http[s]?:\/\//: {
stdlib::ensure_packages('python-etcd3gw',{
name => $::oslo::params::python_etcd3gw_package_name,
name => $oslo::params::python_etcd3gw_package_name,
ensure => $package_ensure,
tag => ['openstack'],
})
}
/^memcached:\/\//: {
stdlib::ensure_packages('python-pymemcache',{
name => $::oslo::params::python_pymemcache_package_name,
name => $oslo::params::python_pymemcache_package_name,
ensure => $package_ensure,
tag => ['openstack'],
})
}
/^(kazoo|zookeeper):\/\//: {
stdlib::ensure_packages('python-kazoo',{
name => $::oslo::params::python_kazoo_package_name,
name => $oslo::params::python_kazoo_package_name,
ensure => $package_ensure,
tag => ['openstack'],
})
@@ -54,7 +54,7 @@ define oslo::cors(
'cors/expose_headers'=>{ value => join(any2array($expose_headers), ',') },
'cors/max_age'=>{ value => $max_age },
'cors/allow_methods'=>{ value => join(any2array($allow_methods), ',') },
'cors/allow_headers'=>{ value => join(any2array($allow_headers), ',') }
'cors/allow_headers'=>{ value => join(any2array($allow_headers), ',') },
}
create_resources($name,$cors_options)
}
@@ -146,7 +146,7 @@ define oslo::db(
require 'mysql::bindings'
require 'mysql::bindings::python'
if $connection =~ /^mysql\+pymysql/ {
$backend_package = $::oslo::params::pymysql_package_name
$backend_package = $oslo::params::pymysql_package_name
}else{
$backend_package = undef
}
@@ -48,7 +48,7 @@ define oslo::reports(
if$manage_package{
stdlib::ensure_packages( 'oslo.reports', {
name => $::oslo::params::oslo_reports_package_name,
name => $oslo::params::oslo_reports_package_name,
ensure => $package_ensure,
tag => ['openstack'],
})
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.