From 53fdf2a0f3e7f4a47ffcdf7c78d3659948808d00 Mon Sep 17 00:00:00 2001
From: Robert de Bock <robert@meinit.nl>
Date: Wed, 15 Sep 2021 10:44:50 +0200
Subject: [PATCH] Add bookwork, combine bullseye+bookwork and focal+bionic to
 all.

---
 .github/workflows/molecule.yml |  2 +-
 .gitlab-ci.yml                 |  2 +-
 README.md                      | 12 ++++++------
 meta/main.yml                  |  6 ++----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index 7be5bc6..7c8e2c7 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -40,7 +40,7 @@ jobs:
           - image: "debian"
             tag: "latest"
           - image: "debian"
-            tag: "bullseye"
+            tag: "bookworm"
           - image: "fedora"
             tag: "33"
           - image: "fedora"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c96b66..f8b1225 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ molecule:
       - image: "debian"
         tag: "latest"
       - image: "debian"
-        tag: "bullseye"
+        tag: "bookworm"
       - image: "fedora"
         tag: "33"
       - image: "fedora"
diff --git a/README.md b/README.md
index b2bd974..0b70299 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ This example is taken from `molecule/default/converge.yml` and is tested on each
           value: 0
 ```
 
-The machine needs to be prepared in CI this is done using `molecule/default/prepare.yml`:
+The machine needs to be prepared. In CI this is done using `molecule/default/prepare.yml`:
 ```yaml
 ---
 - name: prepare
@@ -53,7 +53,7 @@ Also see a [full explanation and example](https://robertdebock.nl/how-to-use-the
 
 ## [Role Variables](#role-variables)
 
-These variables are set in `defaults/main.yml`:
+The default values for the variables are set in `defaults/main.yml`:
 ```yaml
 ---
 # defaults file for grub
@@ -72,9 +72,9 @@ grub_recordfail_timeout: "{{ grub_timeout }}"
 
 - pip packages listed in [requirements.txt](https://github.com/robertdebock/ansible-role-grub/blob/master/requirements.txt).
 
-## [Status of requirements](#status-of-requirements)
+## [Status of used roles](#status-of-requirements)
 
-The following roles are used to prepare a system. You may choose to prepare your system in another way, I have tested these roles as well.
+The following roles are used to prepare a system. You can prepare your system in another way.
 
 | Requirement | GitHub | GitLab |
 |-------------|--------|--------|
@@ -95,10 +95,10 @@ This role has been tested on these [container images](https://hub.docker.com/u/r
 |---------|----|
 |alpine|all|
 |el|8|
-|debian|buster, bullseye|
+|debian|all|
 |fedora|all|
 |opensuse|all|
-|ubuntu|focal, bionic|
+|ubuntu|all|
 
 The minimum version of Ansible required is 2.10, tests have been done to:
 
diff --git a/meta/main.yml b/meta/main.yml
index 33bd288..cc64f07 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -17,8 +17,7 @@ galaxy_info:
         - 8
     - name: Debian
       versions:
-        - buster
-        - bullseye
+        - all
     - name: Fedora
       versions:
         - all
@@ -27,8 +26,7 @@ galaxy_info:
         - all
     - name: Ubuntu
       versions:
-        - focal
-        - bionic
+        - all
 
   galaxy_tags:
     - grub