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
changes/55/12755/1
Sergii Kipot 9 years ago
parent ec5ab0e2b9
commit b3ad534302

@ -2262,11 +2262,6 @@ puppet_install_from_git () {
unset a unset a
fi fi
done 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 () { puppet_install_from_puppet () {

Loading…
Cancel
Save