From 8bcf0b49d960a6f63b1f86de79d17a505a65370d Mon Sep 17 00:00:00 2001 From: Micah Abbott Date: Thu, 28 Jun 2018 10:47:07 -0400 Subject: [PATCH 1/2] dsv: update role to be more consistent across all streams Almost all of the streams are using `overlay2` as the docker storage driver now, so we can remove a lot of the conditional workarounds we had. If we can get CAHC to switch to `overlay2` (see CentOS/sig-atomic-buildscripts#341), we can simplify this role even more. --- roles/docker_storage_verify/tasks/main.yml | 36 ++++++------------- roles/docker_storage_verify/vars/centos-7.yml | 1 - roles/docker_storage_verify/vars/centos.yml | 1 - .../vars/centosdev-7.yml | 1 - .../vars/devicemapper.yml | 3 -- .../docker_storage_verify/vars/fedora-26.yml | 1 - .../docker_storage_verify/vars/fedora-27.yml | 1 - .../docker_storage_verify/vars/fedora-28.yml | 1 - .../docker_storage_verify/vars/fedora-29.yml | 1 - roles/docker_storage_verify/vars/overlay2.yml | 3 -- roles/docker_storage_verify/vars/redhat-3.yml | 3 -- .../docker_storage_verify/vars/redhat-7.5.yml | 1 - roles/docker_storage_verify/vars/redhat-7.yml | 1 - roles/docker_storage_verify/vars/redhat.yml | 1 - 14 files changed, 11 insertions(+), 44 deletions(-) delete mode 120000 roles/docker_storage_verify/vars/centos-7.yml delete mode 120000 roles/docker_storage_verify/vars/centos.yml delete mode 120000 roles/docker_storage_verify/vars/centosdev-7.yml delete mode 100644 roles/docker_storage_verify/vars/devicemapper.yml delete mode 120000 roles/docker_storage_verify/vars/fedora-26.yml delete mode 120000 roles/docker_storage_verify/vars/fedora-27.yml delete mode 120000 roles/docker_storage_verify/vars/fedora-28.yml delete mode 120000 roles/docker_storage_verify/vars/fedora-29.yml delete mode 100644 roles/docker_storage_verify/vars/overlay2.yml delete mode 100644 roles/docker_storage_verify/vars/redhat-3.yml delete mode 120000 roles/docker_storage_verify/vars/redhat-7.5.yml delete mode 120000 roles/docker_storage_verify/vars/redhat-7.yml delete mode 120000 roles/docker_storage_verify/vars/redhat.yml diff --git a/roles/docker_storage_verify/tasks/main.yml b/roles/docker_storage_verify/tasks/main.yml index 85642f0..d4a1e17 100644 --- a/roles/docker_storage_verify/tasks/main.yml +++ b/roles/docker_storage_verify/tasks/main.yml @@ -1,33 +1,19 @@ --- # vim: set ft=ansible: # -- name: Include distribution vars - include_vars: "{{ item }}" - with_first_found: - - "{{ ansible_distribution|lower }}-{{ ansible_distribution_version }}.yml" - - "{{ ansible_distribution|lower }}-{{ ansible_distribution_major_version }}.yml" - - "{{ ansible_distribution|lower }}.yml" +- name: Set storage driver + set_fact: + storage_driver: 'overlay2' -- name: Fail if required variables are not defined - when: driver is undefined - fail: - msg: "The required variables are not defined. Check files under roles/docker_storage_verify/vars" +- when: ansible_distribution == 'CentOSDev' + name: Set storage driver for CAHC + set_fact: + storage_driver: 'devicemapper' - # When all the streams are on docker 1.13, we should start using - # docker info --format '{{.Driver}}' - name: Check Docker storage driver - shell: "docker info | grep -oP '(?<=Storage Driver: ).*'" - register: storage_driver - failed_when: storage_driver.stdout != driver + command: "docker info --format {% raw %}{{.Driver}}{% endraw %}" + register: di + failed_when: "di.stdout != storage_driver" -- name: Check for F26 Docker mount - when: - - ansible_distribution == 'Fedora' - - ansible_distribution_major_version == '26' - command: findmnt /var/lib/docker - -- name: Check for Fedora Rawhide Docker mount - when: - - ansible_distribution == 'Fedora' - - ansible_distribution_major_version > '26' +- name: Check for Docker mount command: findmnt /var/lib/docker/containers diff --git a/roles/docker_storage_verify/vars/centos-7.yml b/roles/docker_storage_verify/vars/centos-7.yml deleted file mode 120000 index 9e3b3f5..0000000 --- a/roles/docker_storage_verify/vars/centos-7.yml +++ /dev/null @@ -1 +0,0 @@ -devicemapper.yml \ No newline at end of file diff --git a/roles/docker_storage_verify/vars/centos.yml b/roles/docker_storage_verify/vars/centos.yml deleted file mode 120000 index 9e3b3f5..0000000 --- a/roles/docker_storage_verify/vars/centos.yml +++ /dev/null @@ -1 +0,0 @@ -devicemapper.yml \ No newline at end of file diff --git a/roles/docker_storage_verify/vars/centosdev-7.yml b/roles/docker_storage_verify/vars/centosdev-7.yml deleted file mode 120000 index 9e3b3f5..0000000 --- a/roles/docker_storage_verify/vars/centosdev-7.yml +++ /dev/null @@ -1 +0,0 @@ -devicemapper.yml \ No newline at end of file diff --git a/roles/docker_storage_verify/vars/devicemapper.yml b/roles/docker_storage_verify/vars/devicemapper.yml deleted file mode 100644 index 193b7d1..0000000 --- a/roles/docker_storage_verify/vars/devicemapper.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -# vim: set ft=ansible: -driver: 'devicemapper' diff --git a/roles/docker_storage_verify/vars/fedora-26.yml b/roles/docker_storage_verify/vars/fedora-26.yml deleted file mode 120000 index 4dc92bf..0000000 --- a/roles/docker_storage_verify/vars/fedora-26.yml +++ /dev/null @@ -1 +0,0 @@ -overlay2.yml \ No newline at end of file diff --git a/roles/docker_storage_verify/vars/fedora-27.yml b/roles/docker_storage_verify/vars/fedora-27.yml deleted file mode 120000 index 4dc92bf..0000000 --- a/roles/docker_storage_verify/vars/fedora-27.yml +++ /dev/null @@ -1 +0,0 @@ -overlay2.yml \ No newline at end of file diff --git a/roles/docker_storage_verify/vars/fedora-28.yml b/roles/docker_storage_verify/vars/fedora-28.yml deleted file mode 120000 index 4dc92bf..0000000 --- a/roles/docker_storage_verify/vars/fedora-28.yml +++ /dev/null @@ -1 +0,0 @@ -overlay2.yml \ No newline at end of file diff --git a/roles/docker_storage_verify/vars/fedora-29.yml b/roles/docker_storage_verify/vars/fedora-29.yml deleted file mode 120000 index 4dc92bf..0000000 --- a/roles/docker_storage_verify/vars/fedora-29.yml +++ /dev/null @@ -1 +0,0 @@ -overlay2.yml \ No newline at end of file diff --git a/roles/docker_storage_verify/vars/overlay2.yml b/roles/docker_storage_verify/vars/overlay2.yml deleted file mode 100644 index 7dd9869..0000000 --- a/roles/docker_storage_verify/vars/overlay2.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -# vim: set ft=ansible: -driver: 'overlay2' diff --git a/roles/docker_storage_verify/vars/redhat-3.yml b/roles/docker_storage_verify/vars/redhat-3.yml deleted file mode 100644 index 7dd9869..0000000 --- a/roles/docker_storage_verify/vars/redhat-3.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -# vim: set ft=ansible: -driver: 'overlay2' diff --git a/roles/docker_storage_verify/vars/redhat-7.5.yml b/roles/docker_storage_verify/vars/redhat-7.5.yml deleted file mode 120000 index 4dc92bf..0000000 --- a/roles/docker_storage_verify/vars/redhat-7.5.yml +++ /dev/null @@ -1 +0,0 @@ -overlay2.yml \ No newline at end of file diff --git a/roles/docker_storage_verify/vars/redhat-7.yml b/roles/docker_storage_verify/vars/redhat-7.yml deleted file mode 120000 index 9e3b3f5..0000000 --- a/roles/docker_storage_verify/vars/redhat-7.yml +++ /dev/null @@ -1 +0,0 @@ -devicemapper.yml \ No newline at end of file diff --git a/roles/docker_storage_verify/vars/redhat.yml b/roles/docker_storage_verify/vars/redhat.yml deleted file mode 120000 index 9e3b3f5..0000000 --- a/roles/docker_storage_verify/vars/redhat.yml +++ /dev/null @@ -1 +0,0 @@ -devicemapper.yml \ No newline at end of file From 31bb414d82d2c6f3149f3aa5c25a278d934d0576 Mon Sep 17 00:00:00 2001 From: Micah Abbott Date: Thu, 28 Jun 2018 15:01:19 -0400 Subject: [PATCH 2/2] fixup! dsv: update role to be more consistent across all streams --- roles/docker_storage_verify/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/docker_storage_verify/tasks/main.yml b/roles/docker_storage_verify/tasks/main.yml index d4a1e17..f810278 100644 --- a/roles/docker_storage_verify/tasks/main.yml +++ b/roles/docker_storage_verify/tasks/main.yml @@ -5,8 +5,8 @@ set_fact: storage_driver: 'overlay2' -- when: ansible_distribution == 'CentOSDev' - name: Set storage driver for CAHC +- name: Set storage driver for CAHC + when: ansible_distribution == 'CentOSDev' set_fact: storage_driver: 'devicemapper'