From d60951d6e09176ab4d027d133dd6a0ed4a4ae2a6 Mon Sep 17 00:00:00 2001 From: Steven Webster Date: Thu, 5 May 2022 14:52:58 -0400 Subject: [PATCH] debian-integration: remove workaround networking UAR 21 Removes unlock workaround for UAR 21: puppet-firewall does not support the --random-fully flag Depends-On: https://review.opendev.org/c/starlingx/tools/+/840975 Story: 2009965 Task: 45288 Signed-off-by: Steven Webster Change-Id: I390c505b294a41414871d1c89abb6800c49e00d0 --- .../source-debian/after_bootstrap_workarounds.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tools/debian-integration/source-debian/after_bootstrap_workarounds.sh b/tools/debian-integration/source-debian/after_bootstrap_workarounds.sh index 1ab7ba27..5618e83c 100755 --- a/tools/debian-integration/source-debian/after_bootstrap_workarounds.sh +++ b/tools/debian-integration/source-debian/after_bootstrap_workarounds.sh @@ -27,13 +27,6 @@ sed -i '125 a \ \ \ \ -> exec { "second mount ${device}":\ sed -i "s@match => '\^\[ ]\*global_filter =',@match => '\^\[ \\\t]\*#? ?global_filter =',@g" /usr/share/puppet/modules/platform/manifests/worker.pp sed -i "s@match => '\^\[ ]\*global_filter =',@match => '\^\[ \\\t]\*#? ?global_filter =',@g" /usr/share/puppet/modules/platform/manifests/lvm.pp -# UAR 21: -bifile='/home/sysadmin/.uar21' -if [ ! -f ${bifile} ]; then - sed -i "s@random: '--random',@random: '--random-fully',@g" /usr/share/puppet/modules.available/puppetlabs-firewall/lib/puppet/provider/firewall/iptables.rb - touch ${bifile} -fi - # UAR 26: not a fix bifile='/home/sysadmin/.uar26' if [ ! -f ${bifile} ]; then