openstack/puppet-ceph
Code Issues Proposed changes

Move enable_sig and release to ceph::params

Browse Source 
This patch moves these parameters to ceph::params. This will allow
the code to make better decisions in future patches.

Change-Id: I26beaea4c1e036b7a8cbb9935a9b3206c8008b2c
This commit is contained in:
Keith Schincke 2016-06-14 11:53:06 -04:00
parent 523c32d255
commit df1e04c81c
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/params.pp
View File

@ -31,10 +31,21 @@
# [*rgw_socket_path*] The socket path of the rados gateway
# Optional. Defaults to '/tmp/radosgw.sock'
#
# [*enable_sig*] Whether or not enable SIG repository.
# CentOS SIG repository contains Ceph packages built by CentOS community.
# https://wiki.centos.org/SpecialInterestGroup/Storage/
# Optional. Defaults to False
#
# [*release*] The name of the Ceph release to install
# Optional. Default to 'jewel'.
#
class ceph::params (
$exec_timeout = 600,
$packages = 'ceph', # just provide the minimum per default
$exec_timeout = 600,
$packages = 'ceph', # just provide the minimum per default
$rgw_socket_path = '/tmp/radosgw.sock',
$enable_sig = false,
$release = 'jewel',
) {
case $::osfamily {

10
manifests/repo.pp
View File

@ -34,7 +34,7 @@
# Optional. Defaults to 'present'.
#
# [*release*] The name of the Ceph release to install
# Optional. Default to 'jewel'.
# Optional. Default to 'jewel' in ceph::params.
#
# [*fastcgi*] Install Ceph fastcgi apache module for Ceph
# Optional. Defaults to 'false'
@ -54,18 +54,18 @@
# [*enable_sig*] Whether or not enable SIG repository.
# CentOS SIG repository contains Ceph packages built by CentOS community.
# https://wiki.centos.org/SpecialInterestGroup/Storage/
# Optional. Defaults to False
# Optional. Defaults to False in ceph::params.
#
class ceph::repo (
$ensure = present,
$release = 'jewel',
$release = $::ceph::params::release,
$fastcgi = false,
$proxy = undef,
$proxy_username = undef,
$proxy_password = undef,
$enable_epel = true,
$enable_sig = false,
) {
$enable_sig = $::ceph::params::enable_sig,
) inherits ceph::params {
case $::osfamily {
'Debian': {
include ::apt