openstack
/
puppet-ceph
Code Issues Proposed changes

Merge "Support array for rgw_frontend"

This commit is contained in:
Zuul 2023-03-10 08:34:04 +00:00 committed by Gerrit Code Review
parent 1f80fff1eb f28ecc8243
commit 8a9e223a9b
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
# [*rgw_frontends*] Arguments to the rgw frontend
# Optional. Default is 'beast port=7480'
# Optional. Default is ['beast', 'port=7480']
#
define ceph::rgw::beast (
$rgw_frontends = 'beast port=7480',
$rgw_frontends = ['beast', 'port=7480'],
) {
unless $name =~ /^radosgw\..+/ {
@ -30,6 +30,6 @@ define ceph::rgw::beast (
}
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
# [*rgw_frontends*] Arguments to the rgw frontend
# Optional. Default is 'civetweb port=7480'
# Optional. Default is ['civetweb', 'port=7480']
#
define ceph::rgw::civetweb (
$rgw_frontends = 'civetweb port=7480',
$rgw_frontends = ['civetweb', 'port=7480'],
) {
unless $name =~ /^radosgw\..+/ {
@ -30,6 +30,6 @@ define ceph::rgw::civetweb (
}
ceph_config {
"client.${name}/rgw_frontends": value => $rgw_frontends;
"client.${name}/rgw_frontends": value => join(any2array($rgw_frontends), ' ');
}
}