openstack/fuel-library
Code Issues Proposed changes

Merge "Increase kernel.pid_max value for ceph-osd nodes" into stable/8.0

Browse Source
This commit is contained in:
Jenkins 2016-01-26 13:47:52 +00:00 committed by Gerrit Code Review
commit f7a008e680
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
deployment/puppet/ceph/manifests/init.pp
View File

@ -3,8 +3,8 @@
class ceph ( class ceph (
# General settings # General settings
$mon_hosts, $mon_hosts = undef,
$mon_ip_addresses, $mon_ip_addresses = undef,
$cluster_node_address = $::ipaddress, # This should be the cluster service address $cluster_node_address = $::ipaddress, # This should be the cluster service address
$primary_mon = $::hostname, # This should be the first controller $primary_mon = $::hostname, # This should be the first controller
$mon_addr = $::ipaddress, # This needs to be replaced with the address we want to bind the mon to (if this is a mon) $mon_addr = $::ipaddress, # This needs to be replaced with the address we want to bind the mon to (if this is a mon)
@ -94,8 +94,12 @@ class ceph (
cwd => '/root', cwd => '/root',
} }
# the regex includes all roles that require ceph.conf
if roles_include(['primary-controller', 'controller', 'ceph-mon', 'ceph-osd', 'compute', 'cinder']) { if roles_include(['primary-controller', 'controller', 'ceph-mon', 'ceph-osd', 'compute', 'cinder']) {
# the regex above includes all roles that require ceph.conf
validate_array($mon_hosts)
validate_array($mon_ip_addresses)
include ceph::ssh include ceph::ssh
include ceph::params include ceph::params
include ceph::conf include ceph::conf
@ -104,8 +108,8 @@ class ceph (
if roles_include(['primary-controller', 'controller', 'ceph-mon', 'ceph-osd']) { if roles_include(['primary-controller', 'controller', 'ceph-mon', 'ceph-osd']) {
service { 'ceph': service { 'ceph':
name => $ceph::params::service_name,
ensure => 'running', ensure => 'running',
name => $ceph::params::service_name,
enable => true, enable => true,
require => Class['ceph::conf'] require => Class['ceph::conf']
} }
@ -137,6 +141,13 @@ class ceph (
include ceph::osds include ceph::osds
Class['ceph::conf'] -> Class['ceph::osds'] Class['ceph::conf'] -> Class['ceph::osds']
Ceph_conf <||> ~> Service['ceph'] Ceph_conf <||> ~> Service['ceph']
# set the recommended value according: http://tracker.ceph.com/issues/10988
sysctl::value { 'kernel.pid_max':
value => '4194303',
}
Sysctl::Value <| |> -> Service['ceph']
} }
} }

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

@ -13,7 +13,7 @@ class ceph::keystone (
description => 'Openstack Object-Store Service', description => 'Openstack Object-Store Service',
} }
keystone_endpoint {"$region/swift": keystone_endpoint {"${region}/swift":
ensure => present, ensure => present,
public_url => "${pub_protocol}://${pub_ip}:${swift_endpoint_port}/swift/v1", public_url => "${pub_protocol}://${pub_ip}:${swift_endpoint_port}/swift/v1",
admin_url => "http://${adm_ip}:${swift_endpoint_port}/swift/v1", admin_url => "http://${adm_ip}:${swift_endpoint_port}/swift/v1",

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

@ -11,8 +11,8 @@ class ceph::nova_compute (
if !defined(Service['libvirt'] ) { if !defined(Service['libvirt'] ) {
service { 'libvirt': service { 'libvirt':
name => $::ceph::params::libvirt_service_name,
ensure => 'running', ensure => 'running',
name => $::ceph::params::libvirt_service_name,
} }
} }

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

@ -55,8 +55,8 @@ class ceph::radosgw (
# check out httpd package/service is defined # check out httpd package/service is defined
if !defined(Package['httpd']) { if !defined(Package['httpd']) {
package { 'httpd': package { 'httpd':
name => $::ceph::params::package_httpd,
ensure => 'installed', ensure => 'installed',
name => $::ceph::params::package_httpd,
} }
} }