openstack/puppet-swift
Code Issues Proposed changes

Prepare to enable only_variable_string

Browse Source 
Change-Id: I7e4e9adfcd6d70c8a792a49a1b6e54db4af2e6b3
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-16 02:16:41 +09:00
parent f631648816
commit 4f67d98df4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/storage/all.pp
View File

@@ -178,17 +178,17 @@ class swift::storage::all (
) inherits swift::params { ) inherits swift::params {
include swift::deps include swift::deps
if ("${$object_port}" == '6000') { if ("${$object_port}" == '6000') { # lint:ignore:only_variable_string
warning("The default port for the object storage server has changed \ warning("The default port for the object storage server has changed \
from 6000 to 6200 and will be changed in a later release") from 6000 to 6200 and will be changed in a later release")
} }
if ("${container_port}" == '6001') { if ("${container_port}" == '6001') { # lint:ignore:only_variable_string
warning("The default port for the container storage server has changed \ warning("The default port for the container storage server has changed \
from 6001 to 6201 and will be changed in a later release") from 6001 to 6201 and will be changed in a later release")
} }
if ("${$account_port}" == '6002') { if ("${$account_port}" == '6002') { # lint:ignore:only_variable_string
warning("The default port for the account storage server has changed \ warning("The default port for the account storage server has changed \
from 6002 to 6202 and will be changed in a later release") from 6002 to 6202 and will be changed in a later release")
} }
@@ -225,19 +225,19 @@ from 6002 to 6202 and will be changed in a later release")
outgoing_chmod => $outgoing_chmod, outgoing_chmod => $outgoing_chmod,
} }
swift::storage::server { "${account_port}": swift::storage::server { "${account_port}": # lint:ignore:only_variable_string
type => 'account', type => 'account',
pipeline => $account_pipeline, pipeline => $account_pipeline,
workers => $account_server_workers, workers => $account_server_workers,
} }
swift::storage::server { "${container_port}": swift::storage::server { "${container_port}": # lint:ignore:only_variable_string
type => 'container', type => 'container',
pipeline => $container_pipeline, pipeline => $container_pipeline,
workers => $container_server_workers, workers => $container_server_workers,
} }
swift::storage::server { "${object_port}": swift::storage::server { "${object_port}": # lint:ignore:only_variable_string
type => 'object', type => 'object',
pipeline => $object_pipeline, pipeline => $object_pipeline,
workers => $object_server_workers, workers => $object_server_workers,

2
manifests/storage/loopback.pp
View File

@@ -76,6 +76,6 @@ define swift::storage::loopback (
} }
# NOTE(mgagne) Puppet does not allow hash keys to be bare variables. # NOTE(mgagne) Puppet does not allow hash keys to be bare variables.
# Keep double-quotes to avoid parse errors. # Keep double-quotes to avoid parse errors.
$device_config_hash = { "${name}" => $storage_params } $device_config_hash = { $name => $storage_params }
create_resources("swift::storage::${fstype}", $device_config_hash) create_resources("swift::storage::${fstype}", $device_config_hash)
} }