Prepare for voxpupuli-puppet-lint-plugins
Fix new lint errors detected when full of the voxpupili lint plugins are enabled. Change-Id: I2bdb5c200f3937ae018a8c34485ef3bd4d833763 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -76,7 +76,6 @@ define openstacklib::db::mysql (
|
||||
# DEPRECATED PARAMETER
|
||||
Optional[String[1]] $password_hash = undef,
|
||||
) {
|
||||
|
||||
include mysql::server
|
||||
include mysql::client
|
||||
|
||||
|
@@ -45,7 +45,6 @@ define openstacklib::db::mysql::host_access (
|
||||
Boolean $create_grant = true,
|
||||
Variant[String[1], Array[String[1]]] $tls_options = ['NONE'],
|
||||
) {
|
||||
|
||||
if ! ($title =~ /_/) {
|
||||
fail('Title must be $dbname_$host')
|
||||
}
|
||||
|
@@ -38,8 +38,7 @@ define openstacklib::db::postgresql (
|
||||
Variant[String[1], Array[String[1]]] $privileges = 'ALL',
|
||||
# DEPRECATED PARAMETERS
|
||||
Optional[String[1]] $password_hash = undef,
|
||||
){
|
||||
|
||||
) {
|
||||
if $password_hash != undef {
|
||||
warning('The password_hash parameter was deprecated and will be removed
|
||||
in a future release. Use password instead')
|
||||
|
@@ -16,12 +16,11 @@
|
||||
# (optional) ensure state for package.
|
||||
# Defaults to 'present'
|
||||
#
|
||||
class openstacklib::iscsid(
|
||||
class openstacklib::iscsid (
|
||||
Boolean $enabled = true,
|
||||
Boolean $manage_service = true,
|
||||
$package_ensure = 'present'
|
||||
) {
|
||||
|
||||
include openstacklib::params
|
||||
|
||||
package { 'open-iscsi':
|
||||
|
@@ -61,7 +61,7 @@
|
||||
# (optional) Manage or not the vhost
|
||||
# Defaults to true
|
||||
#
|
||||
define openstacklib::messaging::rabbitmq(
|
||||
define openstacklib::messaging::rabbitmq (
|
||||
String[1] $userid = 'guest',
|
||||
String[1] $password = 'guest',
|
||||
String[1] $virtual_host = '/',
|
||||
@@ -73,7 +73,6 @@ define openstacklib::messaging::rabbitmq(
|
||||
Boolean $manage_user_permissions = true,
|
||||
Boolean $manage_vhost = true,
|
||||
) {
|
||||
|
||||
if $manage_user {
|
||||
if $userid == 'guest' {
|
||||
$is_admin_real = false
|
||||
@@ -101,5 +100,4 @@ define openstacklib::messaging::rabbitmq(
|
||||
'provider' => 'rabbitmqctl',
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -12,11 +12,10 @@
|
||||
# (Optional) The name of the package to install
|
||||
# Defaults to $openstacklib::params::openstackclient_package_name
|
||||
#
|
||||
class openstacklib::openstackclient(
|
||||
class openstacklib::openstackclient (
|
||||
$package_name = $openstacklib::params::openstackclient_package_name,
|
||||
$package_ensure = 'present',
|
||||
) inherits openstacklib::params {
|
||||
|
||||
stdlib::ensure_packages($package_name, {
|
||||
'ensure' => $package_ensure,
|
||||
'tag' => ['openstack', 'openstackclient']
|
||||
|
@@ -4,7 +4,6 @@
|
||||
# should be considered to be constant
|
||||
#
|
||||
class openstacklib::params {
|
||||
|
||||
include openstacklib::defaults
|
||||
|
||||
$openstackclient_package_name = 'python3-openstackclient'
|
||||
|
@@ -60,15 +60,16 @@ define openstacklib::policy (
|
||||
Enum['yaml'] $file_format = 'yaml',
|
||||
Boolean $purge_config = false,
|
||||
) {
|
||||
|
||||
if empty($policies) {
|
||||
create_resources('openstacklib::policy::default', { $policy_path => {
|
||||
file_mode => $file_mode,
|
||||
file_user => $file_user,
|
||||
file_group => $file_group,
|
||||
file_format => $file_format,
|
||||
purge_config => $purge_config,
|
||||
}})
|
||||
create_resources('openstacklib::policy::default', {
|
||||
$policy_path => {
|
||||
file_mode => $file_mode,
|
||||
file_user => $file_user,
|
||||
file_group => $file_group,
|
||||
file_format => $file_format,
|
||||
purge_config => $purge_config,
|
||||
},
|
||||
})
|
||||
} else {
|
||||
$policy_defaults = {
|
||||
file_path => $policy_path,
|
||||
|
@@ -46,7 +46,6 @@ define openstacklib::policy::base (
|
||||
Enum['yaml'] $file_format = 'yaml',
|
||||
Boolean $purge_config = false,
|
||||
) {
|
||||
|
||||
ensure_resource('openstacklib::policy::default', $file_path, {
|
||||
file_path => $file_path,
|
||||
file_mode => $file_mode,
|
||||
|
@@ -37,7 +37,6 @@ define openstacklib::policy::default (
|
||||
Enum['yaml'] $file_format = 'yaml',
|
||||
Boolean $purge_config = false,
|
||||
) {
|
||||
|
||||
ensure_resource('file', $file_path, {
|
||||
mode => $file_mode,
|
||||
owner => $file_user,
|
||||
|
@@ -21,10 +21,9 @@
|
||||
# (required) The services that should be in the policy-rc.d shell script
|
||||
# that should not autostart on install.
|
||||
#
|
||||
class openstacklib::policyrcd(
|
||||
class openstacklib::policyrcd (
|
||||
Array[String[1]] $services
|
||||
) {
|
||||
|
||||
if $facts['os']['family'] == 'Debian' {
|
||||
# We put this out there so openstack services wont auto start
|
||||
# when installed.
|
||||
|
@@ -65,7 +65,7 @@
|
||||
# Environment to use
|
||||
# string; optional; default to empty array
|
||||
#
|
||||
define openstacklib::service_validation(
|
||||
define openstacklib::service_validation (
|
||||
$command,
|
||||
$service_name = $name,
|
||||
$path = '/usr/bin:/bin:/usr/sbin:/sbin',
|
||||
@@ -78,7 +78,6 @@ define openstacklib::service_validation(
|
||||
$unless = undef,
|
||||
$environment = [],
|
||||
) {
|
||||
|
||||
if $onlyif and $unless {
|
||||
fail ('Only one parameter should be declared: onlyif or unless')
|
||||
}
|
||||
@@ -99,6 +98,4 @@ define openstacklib::service_validation(
|
||||
|
||||
anchor { "create ${service_name} anchor": }
|
||||
-> Exec<| title == "execute ${service_name} validation" |>
|
||||
|
||||
}
|
||||
|
||||
|
@@ -288,7 +288,6 @@ define openstacklib::wsgi::apache (
|
||||
$error_log_syslog = undef,
|
||||
$log_level = undef,
|
||||
) {
|
||||
|
||||
include apache
|
||||
|
||||
# Ensure there's no trailing '/' except if this is also the only character
|
||||
|
Reference in New Issue
Block a user