openstack/kolla-ansible
Code Issues Proposed changes

Remove egrep usage from scripts

Browse Source 
egrep: warning: egrep is obsolescent; using grep -E

Change-Id: I4df0d520546da141cafc15e9464149059fdc06a6
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
This commit is contained in:
Michal Nasiadka
2025-07-10 12:38:18 +02:00
committed by Pierre Riteau
parent 07726215dc
commit 180721846e
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/container-engine-migration/files/ce-cleanup.sh
View File

@@ -21,7 +21,7 @@ images_to_remove=$(sudo $engine images --filter "label=kolla_version" -q -a)
if [ -n "${containers_to_kill}" ]; then if [ -n "${containers_to_kill}" ]; then
volumes_to_remove=$(sudo $engine inspect -f '{{range .Mounts}} {{printf "%s\n" .Name }}{{end}}' ${containers_to_kill} | \ volumes_to_remove=$(sudo $engine inspect -f '{{range .Mounts}} {{printf "%s\n" .Name }}{{end}}' ${containers_to_kill} | \
egrep -v '(^\s*$)' | sort | uniq) grep -Ev '(^\s*$)' | sort | uniq)
echo "Stopping containers..." echo "Stopping containers..."
for container in ${containers_to_kill}; do for container in ${containers_to_kill}; do

6
tests/check-logs.sh
View File

@@ -14,19 +14,19 @@ function check_openstack_log_file_for_level {
# $1: file # $1: file
# $2: log level # $2: log level
# Filter out false positives from logged config options. # Filter out false positives from logged config options.
sudo egrep " $2 " $1 | egrep -v "(logging_exception_prefix|rate_limit_except_level)" sudo grep -E " $2 " $1 | grep -Ev "(logging_exception_prefix|rate_limit_except_level)"
} }
function check_fluentd_log_file_for_level { function check_fluentd_log_file_for_level {
# $1: file # $1: file
# $2: log level # $2: log level
sudo egrep "\[$2\]:" $1 sudo grep -E "\[$2\]:" $1
} }
function check_fluentd_log_file_for_content { function check_fluentd_log_file_for_content {
# $1: file # $1: file
# $2: content # $2: content
sudo egrep "$2" $1 sudo grep -E "$2" $1
} }
function check_fluentd_missing_logs { function check_fluentd_missing_logs {

4
tools/cleanup-containers
View File

@@ -24,12 +24,12 @@ fi
if [ -n "$1" ]; then if [ -n "$1" ]; then
containers_to_kill=$(sudo $engine ps --filter "label=kolla_version" --format "{{.Names}}" -a | grep -E "$1" | awk '{print $1}') containers_to_kill=$(sudo $engine ps --filter "label=kolla_version" --format "{{.Names}}" -a | grep -E "$1" | awk '{print $1}')
volumes_to_remove=$(sudo $engine inspect -f '{{range .Mounts}} {{printf "%s\n" .Name }}{{end}}' ${containers_to_kill} | \ volumes_to_remove=$(sudo $engine inspect -f '{{range .Mounts}} {{printf "%s\n" .Name }}{{end}}' ${containers_to_kill} | \
egrep -v '(^\s*$)' | sort | uniq) grep -Ev '(^\s*$)' | sort | uniq)
else else
containers_to_kill=$(sudo $engine ps --filter "label=kolla_version" --format "{{.Names}}" -a) containers_to_kill=$(sudo $engine ps --filter "label=kolla_version" --format "{{.Names}}" -a)
volumes_to_remove=$(sudo $engine inspect -f '{{range .Mounts}} {{printf "%s\n" .Name }}{{end}}' ${containers_to_kill} | \ volumes_to_remove=$(sudo $engine inspect -f '{{range .Mounts}} {{printf "%s\n" .Name }}{{end}}' ${containers_to_kill} | \
egrep -v '(^\s*$)' | sort | uniq) grep -Ev '(^\s*$)' | sort | uniq)
fi fi
if [[ "${containers_to_kill}" =~ "openvswitch_vswitchd" ]] && [[ "${containers_running}" =~ "neutron_openvswitch_agent" ]]; then if [[ "${containers_to_kill}" =~ "openvswitch_vswitchd" ]] && [[ "${containers_running}" =~ "neutron_openvswitch_agent" ]]; then

4
tools/diag
View File

@@ -3,7 +3,7 @@
container_engine="${1:-docker}" container_engine="${1:-docker}"
echo "##### System Identification #####" echo "##### System Identification #####"
egrep -w 'PRETTY_NAME|VERSION_ID' /etc/os-release grep -Ew 'PRETTY_NAME|VERSION_ID' /etc/os-release
echo "##### ${container_engine^} Version #####" echo "##### ${container_engine^} Version #####"
$container_engine --version $container_engine --version
@@ -18,7 +18,7 @@ echo "##### List installed packages, including editables #####"
pip list pip list
echo "##### Globals.yml file #####" echo "##### Globals.yml file #####"
egrep -w 'kolla_base_distro|openstack_release' /etc/kolla/globals.yml grep -Ew 'kolla_base_distro|openstack_release' /etc/kolla/globals.yml
cat /etc/kolla/globals.yml | grep ^enable_ cat /etc/kolla/globals.yml | grep ^enable_
echo "##### ${container_engine^} Images #####" echo "##### ${container_engine^} Images #####"

2
tools/pre-commit-hook
View File

@@ -26,7 +26,7 @@ find . -type f
echo "=== bashate checks ===" echo "=== bashate checks ==="
files=$(egrep -rlI '^#!/(bin/|usr/bin/env )(ba)?sh' .) files=$(grep -ErlI '^#!/(bin/|usr/bin/env )(ba)?sh' .)
[ "$files" ] && (bashate $files || RES=1) [ "$files" ] && (bashate $files || RES=1)
echo "=== yaml checks ===" echo "=== yaml checks ==="