From 8dcdef8e1e617fca3062bebbcebd2ce4af30d484 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 10 May 2015 14:16:17 -0400 Subject: [PATCH] Don't reload ssh service in a chroot When we're building vms in chroots, attempting to reload the ssh service will fail. Don't do it. Change-Id: I346bdeaa73a9f8a8a7afd3f4866c18c2ed640dbc --- manifests/init.pp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index c789b14..22d09d6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -5,10 +5,16 @@ class ssh ($trusted_ssh_source = 'puppetmaster.openstack.org') { package { $::ssh::params::package_name: ensure => present, } - service { $::ssh::params::service_name: - ensure => running, - hasrestart => true, - subscribe => File['/etc/ssh/sshd_config'], + if ($::in_chroot) { + notify { 'sshd in chroot': + message => 'sshd not refreshed, running in chroot', + } + } else { + service { $::ssh::params::service_name: + ensure => running, + hasrestart => true, + subscribe => File['/etc/ssh/sshd_config'], + } } file { '/etc/ssh/sshd_config': ensure => present,