Add bookwork, combine bullseye+bookwork and focal+bionic to all.

.github/workflows/molecule.yml

@@ -42,7 +42,7 @@ jobs:
           - image: "debian"
             tag: "latest"
           - image: "debian"
-            tag: "bullseye"
+            tag: "bookworm"
           - image: "fedora"
             tag: "33"
           - image: "fedora"

.gitlab-ci.yml

@@ -25,7 +25,7 @@ molecule:
       - image: "debian"
         tag: "latest"
       - image: "debian"
-        tag: "bullseye"
+        tag: "bookworm"
       - image: "fedora"
         tag: "33"
       - image: "fedora"

README.md

@@ -21,7 +21,7 @@ This example is taken from `molecule/default/converge.yml` and is tested on each
       openssh_allow_users: root
 ```
 
-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
@@ -38,7 +38,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 openssh
@@ -149,9 +149,9 @@ openssh_subsystem: sftp {{ openssh_sftp_server }}
 
 - pip packages listed in [requirements.txt](https://github.com/robertdebock/ansible-role-openssh/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 |
 |-------------|--------|--------|
@@ -174,10 +174,10 @@ This role has been tested on these [container images](https://hub.docker.com/u/r
 |alpine|all|
 |amazon|Candidate|
 |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:
 

meta/main.yml

@@ -20,8 +20,7 @@ galaxy_info:
         - 8
     - name: Debian
       versions:
-        - buster
-        - bullseye
+        - all
     - name: Fedora
       versions:
         - all
@@ -30,8 +29,7 @@ galaxy_info:
         - all
     - name: Ubuntu
       versions:
-        - focal
-        - bionic
+        - all
 
   galaxy_tags:
     - openssh