From 98ecb037f99f8dd5b751e99966cf39e4e0a0a64a Mon Sep 17 00:00:00 2001 From: blesson-james Date: Fri, 1 Oct 2021 19:12:25 +0530 Subject: [PATCH 1/4] Issue #605: Updated when condition for checking buildah images Signed-off-by: blesson-james --- .../roles/control_plane_ib/tasks/check_prerequisites.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/control_plane/roles/control_plane_ib/tasks/check_prerequisites.yml b/control_plane/roles/control_plane_ib/tasks/check_prerequisites.yml index 650f859b3..cef14b9c4 100644 --- a/control_plane/roles/control_plane_ib/tasks/check_prerequisites.yml +++ b/control_plane/roles/control_plane_ib/tasks/check_prerequisites.yml @@ -40,7 +40,7 @@ verbosity: 2 - name: Inspect the infiniband_container image - command: "buildah images {{ infiniband_image_name }}" + command: "buildah images" register: infiniband_container_image_result failed_when: false changed_when: false @@ -56,11 +56,11 @@ - name: Update infiniband_container image status set_fact: infiniband_container_image_status: true - when: "'No such image' not in infiniband_container_image_result.stderr" + when: infiniband_image_name in infiniband_container_image_result.stdout tags: install - name: Update infiniband_container container status set_fact: infiniband_container_status: true when: "'infiniband-container' in infiniband_container_result.stdout" - tags: install \ No newline at end of file + tags: install From ced42eb6b4fb702a8c7e018f410da3c3e1d8a55a Mon Sep 17 00:00:00 2001 From: blesson-james Date: Fri, 1 Oct 2021 19:13:49 +0530 Subject: [PATCH 2/4] Issue #605: Updated when condition for checking buildah images Signed-off-by: blesson-james --- .../roles/control_plane_device/tasks/check_prerequisites.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/control_plane/roles/control_plane_device/tasks/check_prerequisites.yml b/control_plane/roles/control_plane_device/tasks/check_prerequisites.yml index 9f5134e47..7d096a3c6 100644 --- a/control_plane/roles/control_plane_device/tasks/check_prerequisites.yml +++ b/control_plane/roles/control_plane_device/tasks/check_prerequisites.yml @@ -39,7 +39,7 @@ verbosity: 2 - name: Inspect the mngmnt_network_container image - command: "buildah images {{ mngmnt_network_image_name }}" + command: "buildah images" register: mngmnt_network_container_image_result failed_when: false changed_when: false @@ -55,7 +55,7 @@ - name: Update mngmnt_network_container image status set_fact: mngmnt_network_container_image_status: true - when: "'No such image' not in mngmnt_network_container_image_result.stderr" + when: mngmnt_network_image_name in mngmnt_network_container_image_result.stdout tags: install - name: Update mngmnt_network_container container status From 3cc3080bb82e400e72b32eb15e34930cac2583ae Mon Sep 17 00:00:00 2001 From: blesson-james Date: Fri, 1 Oct 2021 19:14:57 +0530 Subject: [PATCH 3/4] Issue #605: Updated when condition for checking buildah images Signed-off-by: blesson-james --- .../roles/provision_cobbler/tasks/check_prerequisites.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/control_plane/roles/provision_cobbler/tasks/check_prerequisites.yml b/control_plane/roles/provision_cobbler/tasks/check_prerequisites.yml index a0c752ac1..37963bac3 100644 --- a/control_plane/roles/provision_cobbler/tasks/check_prerequisites.yml +++ b/control_plane/roles/provision_cobbler/tasks/check_prerequisites.yml @@ -50,7 +50,7 @@ when: "'cobbler' not in k8s_namespaces.stdout" - name: Inspect the cobbler image - command: "buildah images {{ cobbler_image_name }}" + command: "buildah images" register: cobbler_image_result failed_when: false changed_when: false @@ -66,7 +66,7 @@ - name: Update cobbler image status set_fact: cobbler_image_status: true - when: "'No such image' not in cobbler_image_result.stderr" + when: cobbler_image_name in cobbler_image_result.stdout tags: install - name: Update cobbler container status @@ -103,4 +103,4 @@ - cobbler_container_status - "'CentOS' in cobbler_profile_list.stdout" - "'* * * * * /usr/bin/ansible-playbook /root/tftp.yml' in crontab_list.stdout" - - "'*/5 * * * * /usr/bin/ansible-playbook /root/inventory_creation.yml' in crontab_list.stdout" \ No newline at end of file + - "'*/5 * * * * /usr/bin/ansible-playbook /root/inventory_creation.yml' in crontab_list.stdout" From cbb197d8f38e03bbbeb597677ff6aca663829a6c Mon Sep 17 00:00:00 2001 From: blesson-james Date: Fri, 1 Oct 2021 19:21:10 +0530 Subject: [PATCH 4/4] Issue #605: Updated when condition for checking buildah images Signed-off-by: blesson-james --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 74ef9790e..6e1a616bf 100644 --- a/docs/README.md +++ b/docs/README.md @@ -100,7 +100,7 @@ AWX | Apache-2.0 | 19.1.0 | Web-based User Interface AWX.AWX | Apache-2.0 | 19.1.0 | Galaxy collection to perform awx configuration AWXkit | Apache-2.0 | to be updated | To perform configuration through CLI commands Cri-o | Apache-2.0 | 1.21 | Container Service -Buildah | Apache-2.0 | 1.19.8 | Tool to build and run container +Buildah | Apache-2.0 | 1.21.4 | Tool to build and run container PostgreSQL | Copyright (c) 1996-2020, PostgreSQL Global Development Group | 10.15 | Database Management System Redis | BSD-3-Clause License | 6.0.10 | In-memory database NGINX | BSD-2-Clause License | 1.14 | -