diff options
| author | Martin Hiner <m.hiner@partner.samsung.com> | 2022-11-21 18:38:57 +0100 |
|---|---|---|
| committer | Martin Hiner <m.hiner@partner.samsung.com> | 2023-04-28 16:16:55 +0200 |
| commit | 53e8b80ed36a9193627862427fa224ed38375d3a (patch) | |
| tree | 14463dda4a87452345c37a1a5252d50db057bc12 /tools/diag | |
| parent | 92ddbdfbc190ec430f5527fcf867efec97e455b4 (diff) | |
| download | kolla-ansible-53e8b80ed36a9193627862427fa224ed38375d3a.tar.gz kolla-ansible-53e8b80ed36a9193627862427fa224ed38375d3a.zip | |
Add container engine option to scripts
This patch add a way to choose container engine inside tool and test
scripts. This is in preparation for Podman introduction but still
leaves Docker as default container engine.
Signed-off-by: Martin Hiner <m.hiner@partner.samsung.com>
Change-Id: I395d2bdb0dfb4b325b6ad197c8893c8a0f768324
Diffstat (limited to 'tools/diag')
| -rwxr-xr-x | tools/diag | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tools/diag b/tools/diag index 2dc5f7880..157747343 100755 --- a/tools/diag +++ b/tools/diag @@ -1,13 +1,15 @@ #!/usr/bin/env bash +container_engine="${1:-docker}" + echo "##### System Identification #####" egrep -w 'PRETTY_NAME|VERSION_ID' /etc/os-release -echo "##### Docker Version #####" -docker --version +echo "##### ${container_engine^} Version #####" +$container_engine --version -echo "##### Docker Info #####" -docker info +echo "##### ${container_engine^} Info #####" +$container_engine info echo "##### Ansible Version #####" ansible --version @@ -19,11 +21,11 @@ echo "##### Globals.yml file #####" egrep -w 'kolla_base_distro|openstack_release' /etc/kolla/globals.yml cat /etc/kolla/globals.yml | grep ^enable_ -echo "##### Docker Images #####" -docker images -a --filter "label=kolla_version" --filter "dangling=false" --format "{{.ID}} - {{.Repository}}:{{.Tag}} - {{.CreatedSince}}" +echo "##### ${container_engine^} Images #####" +$container_engine images -a --filter "label=kolla_version" --filter "dangling=false" --format "{{.ID}} - {{.Repository}}:{{.Tag}} - {{.CreatedSince}}" -echo "##### All Docker Containers #####" -docker ps -a +echo "##### All ${container_engine^} Containers #####" +$container_engine ps -a echo "##### Ip Link Show #####" ip link show |
