From ea7f4621adc160fc0d5c2eede6448cdc3970de47 Mon Sep 17 00:00:00 2001 From: Ivan Anfimov Date: Mon, 30 Jun 2025 10:40:33 +0000 Subject: [PATCH] Replaced usage outdate egrep to grep and small fix for comment Change-Id: I3f93a72ece4f812edded4a0d3a14a67c878f3b69 Signed-off-by: Ivan Anfimov --- doc/source/reference/configuration/using-overrides.rst | 4 ++-- scripts/log-collect.sh | 2 +- scripts/upgrade-utilities/galera-cluster-rolling-restart.yml | 2 +- tests/roles/bootstrap-host/defaults/main.yml | 2 +- tests/roles/bootstrap-host/tasks/prepare_data_disk.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/source/reference/configuration/using-overrides.rst b/doc/source/reference/configuration/using-overrides.rst index a84e926f02..3aae4c6dfe 100644 --- a/doc/source/reference/configuration/using-overrides.rst +++ b/doc/source/reference/configuration/using-overrides.rst @@ -196,7 +196,7 @@ The list of overrides available may be found by executing: ls /etc/ansible/roles/*/defaults/main.yml -1 \ | xargs -I {} grep '_.*_overrides:' {} \ - | egrep -v "^#|^\s" \ + | grep -Ev "^#|^\s" \ | sort -u .. note:: @@ -206,7 +206,7 @@ The list of overrides available may be found by executing: ``/etc/ansible/roles/role_name/defaults/main.yml``. Overriding OpenStack configuration defaults -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ OpenStack has many configuration options available in ``.conf`` files (in a standard ``INI`` file format), diff --git a/scripts/log-collect.sh b/scripts/log-collect.sh index 25d0d49fa3..9e6b53c309 100755 --- a/scripts/log-collect.sh +++ b/scripts/log-collect.sh @@ -134,7 +134,7 @@ function find_files { ! -name '*.html' \ ! -name '*.subunit' \ ! -name "*.journal" \ - ! -name 'ansible.sqlite' | egrep -v 'stackviz|ara-report' + ! -name 'ansible.sqlite' | grep -Ev 'stackviz|ara-report' } function rename_files { diff --git a/scripts/upgrade-utilities/galera-cluster-rolling-restart.yml b/scripts/upgrade-utilities/galera-cluster-rolling-restart.yml index 3d270038b5..302362a97b 100644 --- a/scripts/upgrade-utilities/galera-cluster-rolling-restart.yml +++ b/scripts/upgrade-utilities/galera-cluster-rolling-restart.yml @@ -59,7 +59,7 @@ delegate_to: "{{ groups['utility_all'][0] }}" - name: Check that WSREP is ready and Synced - shell: "/usr/bin/mariadb-admin extended-status | egrep '(wsrep_local_state_comment)'" + shell: "/usr/bin/mariadb-admin extended-status | grep -E '(wsrep_local_state_comment)'" register: mariadb_ready until: - mariadb_ready.rc == 0 diff --git a/tests/roles/bootstrap-host/defaults/main.yml b/tests/roles/bootstrap-host/defaults/main.yml index c68d532942..3c5f9253c0 100644 --- a/tests/roles/bootstrap-host/defaults/main.yml +++ b/tests/roles/bootstrap-host/defaults/main.yml @@ -21,7 +21,7 @@ bootstrap_host_scenario: "{{ lookup('env', 'SCENARIO') | default('aio_lxc', true bootstrap_host_action: "{{ lookup('env', 'ACTION') | default('deploy', true) }}" # # Boolean option to implement OpenStack-Ansible configuration for an AIO -# Switch to no for a multi-node configuration +# Switch to false for a multi-node configuration bootstrap_host_aio_config: true # # Path to the location of the bootstrapping configuration files diff --git a/tests/roles/bootstrap-host/tasks/prepare_data_disk.yml b/tests/roles/bootstrap-host/tasks/prepare_data_disk.yml index f5326d3d69..22ab9cbf18 100644 --- a/tests/roles/bootstrap-host/tasks/prepare_data_disk.yml +++ b/tests/roles/bootstrap-host/tasks/prepare_data_disk.yml @@ -21,7 +21,7 @@ - name: Determine whether partitions labeled openstack-data{1,2} are present ansible.builtin.shell: | set -o pipefail; - parted --script -l -m | egrep -q ':{{ bootstrap_host_data_disk_fs_type }}:openstack-data[12]:;$' + parted --script -l -m | grep -Eq ':{{ bootstrap_host_data_disk_fs_type }}:openstack-data[12]:;$' args: executable: /bin/bash register: data_disk_partitions