aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2022-05-17 22:15:16 +0200
committerHarald Welte <laforge@osmocom.org>2022-05-17 22:15:16 +0200
commite50ad03b46823ccb6fd7810e7632606d836e8ebb (patch)
tree6d4f40788a27f4aa123af058c271e754d92d507a
parentc825551ca8c972aff9fa8ec8a825c33fa6550a50 (diff)
docker: Fix vfs storage cleanup task
The 'grep' logic of Change-Id I58f3f4a26ad6fa4698d87475cefb6ab21e66b15a seems to be inverted. if "overlay2" is found (grep successful) the exit code of grep is '0'. Change-Id: I334b0c71ef626ffd2c84097e902a5164faa3fa8b Related: OS#5827
-rw-r--r--ansible/roles/docker/tasks/main.yml2
-rw-r--r--ansible/vars/Debian-11.yml2
2 files changed, 3 insertions, 1 deletions
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
index 7c7fe85..e6e6d9f 100644
--- a/ansible/roles/docker/tasks/main.yml
+++ b/ansible/roles/docker/tasks/main.yml
@@ -54,7 +54,7 @@
# daemon.json configures overlay2 storage driver, clean up vfs leftovers
- name: cleanup vfs storage dir
- shell: "docker info | grep -q 'Storage Driver: overlay2' && rm -rf /var/lib/docker/vfs"
+ shell: "docker info | grep -q 'Storage Driver: overlay2' || rm -rf /var/lib/docker/vfs"
# After docker is set up, add docuum to clean old docker images
# x86_64 only, as the raspberries need to be upgraded before they can use recent docker images (OS#5453)
diff --git a/ansible/vars/Debian-11.yml b/ansible/vars/Debian-11.yml
new file mode 100644
index 0000000..8361e15
--- /dev/null
+++ b/ansible/vars/Debian-11.yml
@@ -0,0 +1,2 @@
+---
+obs_distro: Debian_11