Merge "Make hiera default values optional"

This commit is contained in:
Jenkins 2015-10-23 22:35:56 +00:00 committed by Gerrit Code Review
commit 36ac4f52ed

View File

@ -79,6 +79,7 @@ sed -i -e '/^\}$/d' applytest/puppetapplytest*
# This gives us the node {} internal contents. # This gives us the node {} internal contents.
sed -i -e 's/^[^][:space:]$]/#&/g' applytest/prep00 applytest/puppetapplytest* sed -i -e 's/^[^][:space:]$]/#&/g' applytest/prep00 applytest/puppetapplytest*
sed -i -e 's@hiera(.\([^.]*\).,\([^)]*\))@\2@' applytest/prep00 applytest/puppetapplytest* sed -i -e 's@hiera(.\([^.]*\).,\([^)]*\))@\2@' applytest/prep00 applytest/puppetapplytest*
sed -i -e "s@hiera(.\([^.]*\).)@'\1NoDefault'@" applytest/prep00 applytest/puppetapplytest*
mv applytest/prep00 applytest/head # These are the top-level variables defined in site.pp mv applytest/prep00 applytest/head # These are the top-level variables defined in site.pp
if [[ `lsb_release -i -s` == 'CentOS' ]]; then if [[ `lsb_release -i -s` == 'CentOS' ]]; then