openstack
/
puppet-ceph
Code Issues Proposed changes

Merge "Ensure absolute path for file creation"

This commit is contained in:
Zuul 2023-07-27 17:16:28 +00:00 committed by Gerrit Code Review
parent 68ece8d8f4 e746c9e412
commit aa95eefdd2
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/key.pp
View File

@ -77,7 +77,7 @@
define ceph::key (
$secret,
$cluster = undef,
$keyring_path = "/etc/ceph/ceph.${name}.keyring",
Stdlib::Absolutepath $keyring_path = "/etc/ceph/ceph.${name}.keyring",
$cap_mon = undef,
$cap_osd = undef,
$cap_mds = undef,

20
manifests/mds.pp
View File

@ -51,16 +51,16 @@
# Optional. Default to 'ceph'.
#
class ceph::mds (
$public_addr = undef,
$pkg_mds = $ceph::params::pkg_mds,
$pkg_mds_ensure = present,
Boolean $mds_activate = true,
$mds_data = undef,
$mds_enable = true,
$mds_ensure = 'running',
$mds_id = $facts['networking']['hostname'],
$keyring = undef,
$cluster = 'ceph',
$public_addr = undef,
$pkg_mds = $ceph::params::pkg_mds,
$pkg_mds_ensure = present,
Boolean $mds_activate = true,
Optional[Stdlib::Absolutepath] $mds_data = undef,
$mds_enable = true,
$mds_ensure = 'running',
$mds_id = $facts['networking']['hostname'],
$keyring = undef,
$cluster = 'ceph',
) inherits ceph::params {
if $mds_data {
$mds_data_real = $mds_data

38
manifests/rgw.pp
View File

@ -88,25 +88,25 @@
# Optional. Default is false
#
define ceph::rgw (
$pkg_radosgw = $ceph::params::pkg_radosgw,
$rgw_ensure = 'running',
$rgw_enable = true,
$rgw_enable_apis = undef,
$rgw_data = "/var/lib/ceph/radosgw/ceph-${name}",
$user = $ceph::params::user_radosgw,
$keyring_path = "/etc/ceph/ceph.client.${name}.keyring",
$log_file = '/var/log/ceph/radosgw.log',
$rgw_dns_name = $facts['networking']['fqdn'],
$rgw_socket_path = $ceph::params::rgw_socket_path,
$rgw_print_continue = false,
$rgw_port = undef,
$frontend_type = 'civetweb',
$rgw_frontends = undef,
$rgw_swift_url = "http://${facts['networking']['fqdn']}:7480",
$rgw_swift_url_prefix = 'swift',
$rgw_swift_account_in_url = false,
$rgw_swift_versioning_enabled = false,
$rgw_trust_forwarded_https = false,
$pkg_radosgw = $ceph::params::pkg_radosgw,
$rgw_ensure = 'running',
$rgw_enable = true,
$rgw_enable_apis = undef,
Stdlib::Absolutepath $rgw_data = "/var/lib/ceph/radosgw/ceph-${name}",
$user = $ceph::params::user_radosgw,
Stdlib::Absolutepath $keyring_path = "/etc/ceph/ceph.client.${name}.keyring",
Stdlib::Absolutepath $log_file = '/var/log/ceph/radosgw.log',
$rgw_dns_name = $facts['networking']['fqdn'],
$rgw_socket_path = $ceph::params::rgw_socket_path,
$rgw_print_continue = false,
$rgw_port = undef,
$frontend_type = 'civetweb',
$rgw_frontends = undef,
$rgw_swift_url = "http://${facts['networking']['fqdn']}:7480",
$rgw_swift_url_prefix = 'swift',
$rgw_swift_account_in_url = false,
$rgw_swift_versioning_enabled = false,
$rgw_trust_forwarded_https = false,
) {
unless $name =~ /^radosgw\..+/ {