openstack/puppet-ceph
Code Issues Proposed changes

Support array for rgw_frontend

Browse Source 
... in addition to a flat string.

Change-Id: Ic5589802c1573dd9e8558812f79d6be505d1767b
This commit is contained in:
Takashi Kajinami 2023-03-08 11:15:53 +09:00
parent b6731d247e
commit f28ecc8243
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/rgw/beast.pp
View File

@ -19,10 +19,10 @@
# #
# == Define: ceph::rgw::beast # == Define: ceph::rgw::beast
# [*rgw_frontends*] Arguments to the rgw frontend # [*rgw_frontends*] Arguments to the rgw frontend
# Optional. Default is 'beast port=7480' # Optional. Default is ['beast', 'port=7480']
# #
define ceph::rgw::beast ( define ceph::rgw::beast (
$rgw_frontends = 'beast port=7480', $rgw_frontends = ['beast', 'port=7480'],
) { ) {
unless $name =~ /^radosgw\..+/ { unless $name =~ /^radosgw\..+/ {
@ -30,6 +30,6 @@ define ceph::rgw::beast (
} }
ceph_config { ceph_config {
"client.${name}/rgw_frontends": value => $rgw_frontends; "client.${name}/rgw_frontends": value => join(any2array($rgw_frontends), ' ');
} }
} }

6
manifests/rgw/civetweb.pp
View File

@ -19,10 +19,10 @@
# #
# == Define: ceph::rgw::civetweb # == Define: ceph::rgw::civetweb
# [*rgw_frontends*] Arguments to the rgw frontend # [*rgw_frontends*] Arguments to the rgw frontend
# Optional. Default is 'civetweb port=7480' # Optional. Default is ['civetweb', 'port=7480']
# #
define ceph::rgw::civetweb ( define ceph::rgw::civetweb (
$rgw_frontends = 'civetweb port=7480', $rgw_frontends = ['civetweb', 'port=7480'],
) { ) {
unless $name =~ /^radosgw\..+/ { unless $name =~ /^radosgw\..+/ {
@ -30,6 +30,6 @@ define ceph::rgw::civetweb (
} }
ceph_config { ceph_config {
"client.${name}/rgw_frontends": value => $rgw_frontends; "client.${name}/rgw_frontends": value => join(any2array($rgw_frontends), ' ');
} }
} }