openstack/fuel-library
Code Issues Proposed changes

Merge "The modified puppet code style"

Browse Source
This commit is contained in:
Jenkins 2014-10-17 08:18:30 +00:00 committed by Gerrit Code Review
commit a26a225a6f
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deployment/puppet/ceph/Rakefile Normal file
View File

@ -0,0 +1,11 @@
require 'rubygems'
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.send('disable_2sp_soft_tabs')
PuppetLint.configuration.send('disable_arrow_alignment')
PuppetLint.configuration.send('disable_autoloader_layout')
PuppetLint.configuration.send('disable_selector_inside_resource')
# Disable check due to upstream bug: https://github.com/rodjek/puppet-lint/issues/170
PuppetLint.configuration.send('disable_class_parameter_defaults')

10
deployment/puppet/ceph/examples/site.pp
View File

@ -16,10 +16,10 @@ $public_network = '192.168.0.0/24'
# cluster_network is necessary to ensure that osd's bind to the expected interface.
$cluster_network = '10.0.0.0/24'
# osd_devices is used in ceph::osd to activate the disk and join it to the
# osd_devices is used in ceph::osd to activate the disk and join it to the
# cluster.
# it may be <device_name|mounted_path>[:journal_device|journal_path]...
$osd_devices = split($::osd_devices_list, " ")
$osd_devices = split($::osd_devices_list, ' ')
########
#RadosGW
@ -36,7 +36,7 @@ $use_rgw = false
#rgw_use_pki if true, attempt to sign the keystone certs and enable PKI
# token verification. If false, will defalt to values that should work with UUID
# this requires keystone.conf to use token_format = PKI and
# this requires keystone.conf to use token_format = PKI and
# keystone-manage pki_setup to have been run. This also assumes that rados is
# being installed on the keystone server, otherwise you will need to move the
# keys yourself into /etc/keystone/ssl.
@ -79,7 +79,7 @@ node 'default' {
public_network => $public_network,
# RadosGW settings
rgw_host => $::osfamily ? {'Debian'=> $::hostname, default => $::fqdn},
rgw_host => $::osfamily ? { 'Debian' => $::hostname, default => $::fqdn },
rgw_port => $rgw_port,
rgw_keyring_path => '/etc/ceph/keyring.radosgw.gateway',
rgw_socket_path => '/tmp/radosgw.sock',
@ -93,7 +93,7 @@ node 'default' {
rgw_keystone_revocation_interval => $::ceph::rgw_use_pki ? { false => 1000000, default => 60 },
rgw_data => '/var/lib/ceph/radosgw',
rgw_dns_name => "*.${::domain}",
rgw_print_continue => 'false',
rgw_print_continue => false,
rgw_nss_db_path => '/etc/ceph/nss',
# Keystone settings

2
deployment/puppet/ceph/manifests/apt.pp
View File

@ -9,7 +9,7 @@ class ceph::apt (
}
apt::key { 'radosgw':
key => '6EAEAE2203C3951A',
require => Class['ceph::ssh']
require => Class['ceph::ssh']
}
Apt::Source {
require => Apt::Key['ceph', 'radosgw'],

3
deployment/puppet/ceph/manifests/conf.pp
View File

@ -58,8 +58,7 @@ class ceph::conf {
creates => ['/root/ceph.bootstrap-mds.keyring',
'/root/ceph.bootstrap-osd.keyring',
'/root/ceph.client.admin.keyring',
'/root/ceph.mon.keyring',
],
'/root/ceph.mon.keyring',],
}
file {'/etc/ceph/ceph.client.admin.keyring':

6
deployment/puppet/ceph/manifests/yum.pp
View File

@ -2,7 +2,7 @@
class ceph::yum (
$release = 'cuttlefish'
)
{
{
yumrepo { 'ext-epel-6.8':
descr => 'External EPEL 6.8',
name => 'ext-epel-6.8',
@ -19,7 +19,7 @@ class ceph::yum (
gpgcheck => '1',
gpgkey => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc',
mirrorlist => absent,
}
}
yumrepo { 'ext-ceph-noarch':
descr => 'External Ceph noarch',
@ -28,7 +28,7 @@ class ceph::yum (
gpgcheck => '1',
gpgkey => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc',
mirrorlist => absent,
}
}
# Fuel repos