openstack
/
puppet-ceph
Code Issues Proposed changes

Merge "Fix puppet-lint before upgrading gem"

This commit is contained in:
Jenkins 2016-09-26 13:33:16 +00:00 committed by Gerrit Code Review
parent a46d5c5a20 39d40883a2
commit d76c21d5bf
6 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/init.pp
View File

@ -173,7 +173,8 @@ class ceph (
include ::ceph::params
if $set_osd_params {
warning('set_osd_params is deprecated. It is here to allow a transition to using this module to assign values and will be removed in a future release.')
warning('set_osd_params is deprecated. It is here to allow a transition to using \
this module to assign values and will be removed in a future release.')
}
package { $::ceph::params::packages :

3
manifests/mon.pp
View File

@ -132,7 +132,8 @@ chmod 0444 ${keyring_path}
",
unless => "/bin/true # comment to satisfy puppet syntax requirements
set -ex
mon_data=\$(ceph-mon ${cluster_option} --id ${id} --show-config-value mon_data) || exit 1 # if ceph-mon fails then the mon is probably not configured yet
mon_data=\$(ceph-mon ${cluster_option} --id ${id} --show-config-value mon_data) || exit 1
# if ceph-mon fails then the mon is probably not configured yet
test -e \$mon_data/done
",
}

3
manifests/params.pp
View File

@ -68,7 +68,8 @@ class ceph::params (
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only supports osfamily Debian or RedHat")
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \
module ${module_name} only supports osfamily Debian or RedHat")
}
}
}

9
manifests/repo.pp
View File

@ -122,7 +122,8 @@ class ceph::repo (
# https://wiki.centos.org/SpecialInterestGroup/Storage/
if $enable_sig {
if $::operatingsystem != 'CentOS' {
warning("CentOS SIG repository is only supported on CentOS operating system, not on ${::operatingsystem}, which can lead to packaging issues.")
warning("CentOS SIG repository is only supported on CentOS operating system, \
not on ${::operatingsystem}, which can lead to packaging issues.")
}
yumrepo { 'ceph-jewel-sig':
enabled => '1',
@ -135,7 +136,8 @@ class ceph::repo (
Yumrepo['ceph-jewel-sig'] -> Package<| tag == 'ceph' |>
} else {
# If you want to deploy Ceph using packages provided by ceph.com repositories.
if ((($::operatingsystem == 'RedHat' or $::operatingsystem == 'CentOS') and (versioncmp($::operatingsystemmajrelease, '7') < 0)) or ($::operatingsystem == 'Fedora' and (versioncmp($::operatingsystemmajrelease, '19') < 0))) {
if ((($::operatingsystem == 'RedHat' or $::operatingsystem == 'CentOS') and (versioncmp($::operatingsystemmajrelease, '7') < 0))
or ($::operatingsystem == 'Fedora' and (versioncmp($::operatingsystemmajrelease, '19') < 0))) {
$el = '6'
} else {
$el = '7'
@ -227,7 +229,8 @@ class ceph::repo (
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only supports osfamily Debian and RedHat")
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \
module ${module_name} only supports osfamily Debian and RedHat")
}
}
}

10
manifests/rgw/apache_fastcgi.pp
View File

@ -101,12 +101,17 @@ define ceph::rgw::apache_fastcgi (
include ::apache::mod::mime
include ::apache::mod::rewrite
#Rewrite rule
#Variable name shrinked in favor of not having
#more than 140 chars per line
$rr = '^/([a-zA-Z0-9-_.]*)([/]?.*) /s3gw.fcgi?page=$1&params=$2&%{QUERY_STRING} [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]'
apache::vhost { "${rgw_dns_name}-radosgw":
servername => $rgw_dns_name,
serveradmin => $admin_email,
port => $rgw_port,
docroot => $docroot,
rewrite_rule => '^/([a-zA-Z0-9-_.]*)([/]?.*) /s3gw.fcgi?page=$1&params=$2&%{QUERY_STRING} [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]',
rewrite_rule => $rr,
access_log => $syslog,
error_log => $syslog,
fastcgi_server => $fcgi_file,
@ -140,7 +145,8 @@ exec /usr/bin/radosgw -c /etc/ceph/ceph.conf -n ${name}",
-> Package[$pkg_fastcgi]
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only supports osfamily Debian and RedHat")
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \
module ${module_name} only supports osfamily Debian and RedHat")
}
}
}

9
spec/defines/ceph_mon_spec.rb
View File

@ -72,7 +72,8 @@ chmod 0444 /tmp/ceph-mon-keyring-A
',
'unless' => '/bin/true # comment to satisfy puppet syntax requirements
set -ex
mon_data=$(ceph-mon --id A --show-config-value mon_data) || exit 1 # if ceph-mon fails then the mon is probably not configured yet
mon_data=$(ceph-mon --id A --show-config-value mon_data) || exit 1
# if ceph-mon fails then the mon is probably not configured yet
test -e $mon_data/done
') }
it { is_expected.to contain_exec('ceph-mon-ceph.client.admin.keyring-A').with(
@ -301,7 +302,8 @@ chmod 0444 /tmp/ceph-mon-keyring-A
',
'unless' => '/bin/true # comment to satisfy puppet syntax requirements
set -ex
mon_data=$(ceph-mon --id A --show-config-value mon_data) || exit 1 # if ceph-mon fails then the mon is probably not configured yet
mon_data=$(ceph-mon --id A --show-config-value mon_data) || exit 1
# if ceph-mon fails then the mon is probably not configured yet
test -e $mon_data/done
') }
it { is_expected.to contain_exec('ceph-mon-ceph.client.admin.keyring-A').with(
@ -529,7 +531,8 @@ chmod 0444 /tmp/ceph-mon-keyring-A
',
'unless' => '/bin/true # comment to satisfy puppet syntax requirements
set -ex
mon_data=$(ceph-mon --id A --show-config-value mon_data) || exit 1 # if ceph-mon fails then the mon is probably not configured yet
mon_data=$(ceph-mon --id A --show-config-value mon_data) || exit 1
# if ceph-mon fails then the mon is probably not configured yet
test -e $mon_data/done
') }
it { is_expected.to contain_exec('ceph-mon-ceph.client.admin.keyring-A').with(