From b3ad534302ed29d40ad51a3e3b6c616d325db993 Mon Sep 17 00:00:00 2001 From: Sergii Kipot Date: Tue, 18 Apr 2017 17:08:48 +0300 Subject: [PATCH] TT#14583 Do not remove puppet code after installation When we install puppet from git repo there will be r10k run executed by puppuet itself and latest code fetched. We shouldn't delete the code because after reboot puppet catalog will be empty until someone runs r10k again. But we need catalog present because we do another puppet run after reboot to finalize steps not executed in chroot phase. Change-Id: I6f28ee26bc7a3404e4fd6affb430f05ca7d96b92 --- deployment.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/deployment.sh b/deployment.sh index 3a2068c..9a55778 100755 --- a/deployment.sh +++ b/deployment.sh @@ -2262,11 +2262,6 @@ puppet_install_from_git () { unset a fi done - - # We want to keep the folder itself (because some day it may be 'production' env passed as pappetenv which - # folder should be existent for normal puppet server startup) but just delete all puppet code from there - echo "Cleanup content from '${TARGET}/${PUPPET_CODE_PATH}', while keeping the folder for further Puppet/r10k usage" - rm -rf "${TARGET:?}/${PUPPET_CODE_PATH:?}"/* } puppet_install_from_puppet () {