starlingx
/
utilities
Code Issues Proposed changes

Merge "Debian: remove grubby workarounds"

This commit is contained in:
Zuul 2022-04-21 19:56:04 +00:00 committed by Gerrit Code Review
parent f5aa0bf970 88a5cb29e1
commit 7ed34a3a76
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/debian-integration/source-debian/after_bootstrap_workarounds.sh
View File

@ -1,11 +1,3 @@
# UBR 1: disable drubby commands
bifile='/home/sysadmin/.ubr1'
if [ ! -f ${bifile} ]; then
sed -i '3,31d' /usr/share/puppet/modules/platform/manifests/grub.pp
sed -i '70,85d' /usr/share/puppet/modules/platform/manifests/compute.pp
touch ${bifile}
fi
# UBR 2: don't start collectd
bifile='/home/sysadmin/.ubr2'
if [ ! -f ${bifile} ]; then

9
tools/debian-integration/source-debian/before_bootstrap_workarounds.sh
View File

@ -60,15 +60,6 @@ fi
# BI 25: ignore puppet apply warnings until we fix them
sed -i 's@Warning|@MMAAAAAAAAAASKED|@g' /usr/local/bin/puppet-manifest-apply.sh
# BI 27: workaround remove grubby commands
bifile='/home/sysadmin/.27'
if [ ! -f ${bifile} ]; then
A=$(grep -Rn "Get grub default kernel" /usr/share/ansible/stx-ansible/playbooks/roles/bootstrap/persist-config/tasks/one_time_config_tasks.yml | awk -F':' '{print $1}')
B=$((A + 8))
sed -i ${A}','${B}'d ' /usr/share/ansible/stx-ansible/playbooks/roles/bootstrap/persist-config/tasks/one_time_config_tasks.yml
touch ${bifile}
fi
# BI 36: first puppet runtime apply
bifile='/home/sysadmin/.bi36'
if [ ! -f ${bifile} ]; then