Merge "Don't reload ssh service in a chroot"

This commit is contained in:
Jenkins 2015-06-29 17:36:10 +00:00 committed by Gerrit Code Review
commit b6c6d37948

@ -5,11 +5,17 @@ class ssh ($trusted_ssh_source = 'puppetmaster.openstack.org') {
package { $::ssh::params::package_name: package { $::ssh::params::package_name:
ensure => present, ensure => present,
} }
if ($::in_chroot) {
notify { 'sshd in chroot':
message => 'sshd not refreshed, running in chroot',
}
} else {
service { $::ssh::params::service_name: service { $::ssh::params::service_name:
ensure => running, ensure => running,
hasrestart => true, hasrestart => true,
subscribe => File['/etc/ssh/sshd_config'], subscribe => File['/etc/ssh/sshd_config'],
} }
}
file { '/etc/ssh/sshd_config': file { '/etc/ssh/sshd_config':
ensure => present, ensure => present,
owner => 'root', owner => 'root',