openstack
/
puppet-swift
Code Issues Proposed changes

Merge "Accept integer for port numbers"

This commit is contained in:
Zuul 2020-05-13 18:10:42 +00:00 committed by Gerrit Code Review
parent 78819e33ae 96d3d3459d
commit b753df974b
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
manifests/storage/all.pp
View File

@ -121,9 +121,9 @@
class swift::storage::all(
$storage_local_net_ip,
$devices = '/srv/node',
$object_port = '6000',
$container_port = '6001',
$account_port = '6002',
$object_port = 6000,
$container_port = 6001,
$account_port = 6002,
$object_pipeline = undef,
$container_pipeline = undef,
$allow_versions = false,
@ -151,16 +151,19 @@ class swift::storage::all(
include swift::deps
if ($object_port == '6000') {
warning('The default port for the object storage server has changed from 6000 to 6200 and will be changed in a later release')
if ("${$object_port}" == '6000') {
warning('The default port for the object storage server has changed \
from 6000 to 6200 and will be changed in a later release')
}
if ($container_port == '6001') {
warning('The default port for the container storage server has changed from 6001 to 6201 and will be changed in a later release')
if ("${container_port}" == '6001') {
warning('The default port for the container storage server has changed \
from 6001 to 6201 and will be changed in a later release')
}
if ($account_port == '6002') {
warning('The default port for the account storage server has changed from 6002 to 6202 and will be changed in a later release')
if ("${$account_port}" == '6002') {
warning('The default port for the account storage server has changed \
from 6002 to 6202 and will be changed in a later release')
}
class { 'swift::storage':
@ -182,7 +185,7 @@ class swift::storage::all(
log_statsd_metric_prefix => $log_statsd_metric_prefix,
}
swift::storage::server { $account_port:
swift::storage::server { "${account_port}":
type => 'account',
config_file_path => 'account-server.conf',
pipeline => $account_pipeline,
@ -193,7 +196,7 @@ class swift::storage::all(
workers => $account_server_workers,
}
swift::storage::server { $container_port:
swift::storage::server { "${container_port}":
type => 'container',
config_file_path => 'container-server.conf',
pipeline => $container_pipeline,
@ -205,7 +208,7 @@ class swift::storage::all(
workers => $container_server_workers,
}
swift::storage::server { $object_port:
swift::storage::server { "${object_port}":
type => 'object',
config_file_path => 'object-server.conf',
pipeline => $object_pipeline,

14
spec/classes/swift_storage_all_spec.rb
View File

@ -11,9 +11,9 @@ describe 'swift::storage::all' do
let :default_params do
{
:devices => '/srv/node',
:object_port => '6000',
:container_port => '6001',
:account_port => '6002',
:object_port => 6000,
:container_port => 6001,
:account_port => 6002,
:log_facility => 'LOG_LOCAL2',
:incoming_chmod => 'Du=rwx,g=rx,o=rx,Fu=rw,g=r,o=r',
:outgoing_chmod => 'Du=rwx,g=rx,o=rx,Fu=rw,g=r,o=r',
@ -30,13 +30,13 @@ describe 'swift::storage::all' do
end
end
[{ :storage_local_net_ip => '127.0.0.1' },
[{ :storage_local_net_ip => '127.0.0.1' },
{
:devices => '/tmp/node',
:storage_local_net_ip => '10.0.0.1',
:object_port => '7000',
:container_port => '7001',
:account_port => '7002',
:object_port => "7000",
:container_port => "7001",
:account_port => "7002",
:object_pipeline => ["healthcheck"],
:container_pipeline => ["healthcheck"],
:account_pipeline => ["healthcheck"],