Update Role to be used by Ansible 2.18 (#2)

Author: borisskert

.github/workflows/main.yml

@@ -19,16 +19,16 @@ jobs:
           path: "${{ github.repository }}"
 
       - name: Run 'default' tests
-        uses: borisskert/molecule-action@v21.01.30
+        uses: borisskert/molecule-action@v24.12.9
         with:
           arguments: test
 
       - name: Run 'all-parameters' tests
-        uses: borisskert/molecule-action@v21.01.30
+        uses: borisskert/molecule-action@v24.12.9
         with:
           arguments: test --scenario-name all-parameters
 
       - name: Run 'state-absent' tests
-        uses: borisskert/molecule-action@v21.01.30
+        uses: borisskert/molecule-action@v24.12.9
         with:
           arguments: test --scenario-name state-absent

README.md

@@ -5,12 +5,12 @@ Ansible role to install gitlab as docker service.
 ## Supported operating systems:
 
 * Ubuntu:
-  * 16.04 (xenial)
-  * 18.04 (bionic)
+  * 24.04 (noble)
+  * 22.04 (jammy)
   * 20.04 (focal)
 * Debian
-  * 9 (stretch)
-  * 10 (buster)
+  * 12 (bookworm)
+  * 11 (bullseye)
 
 ## System requirements
 
@@ -30,42 +30,42 @@ Ansible role to install gitlab as docker service.
 
 ## Role parameters
 
-| Variable      | Type | Mandatory? | Default | Description           |
-|---------------|------|------------|---------|-----------------------|
-| gitlab_image_name    | text | no       | gitlab/gitlab-ce | Docker image name    |
-| gitlab_image_version | text | no       | 12.9.2-ce.0      | Docker image version |
-| gitlab_interface     | ip address | no | 0.0.0.0          | Mapped network for web-interface ports |
-| gitlab_https_port    | port       | no | 443              | Mapped HTTPS port        |
-| gitlab_http_port     | port       | no | 80               | Mapped HTTP port         |
-| gitlab_ssh_port      | port       | no | 10022            | Mapped SSH port          |
-| gitlab_config_volume | path       | no | /srv/gitlab/config | Path to config volume    |
-| gitlab_data_volume   | path       | no | /srv/gitlab/data   | Path to data volume      |
-| gitlab_log_volume    | path       | no | /srv/gitlab/log    | Path to log volume       |
-| gitlab_backup_volume | path       | no | /srv/gitlab/backup | Path to backup volume    |
-| gitlab_external_url  | url        | no | <empty>            | Gitlab Url, like git.example.org |
-| gitlab_ssh_host      | host       | no | <empty>            | SSH Host, like ssh.example.org   |
-| gitlab_shell_ssh_port | host      | no | <empty>            | Gitlab shell SSH port, like 10022 |
-| gitlab_email_enabled  | boolean   | no | false              | Is mailing enabled?               |
-| gitlab_email_from     | email address | no | <empty>        | Email from address                |
-| gitlab_email_display_name | text      | no | <empty>        | Email from name                   |
-| gitlab_email_reply_to     | email address | no | <empty>    | Reply email address               |
-| gitlab_email_subject_suffix | text        | no | <empty>    | Suffix in email subject, like [GitLab] |
-| gitlab_smtp_address         | host        | no | <empty>    | SMTP server host                       |
-| gitlab_smtp_port            | port        | no | <empty>    | SMTP server port                       |
-| gitlab_smtp_user_name       | text        | no | <empty>    | SMTP user name                         |
-| gitlab_smtp_password        | text        | no | <empty>    | SMTP password                          |
-| gitlab_smtp_domain          | text        | no | <empty>    | SMTP domain                            |
-| gitlab_smtp_enable_starttls_auto | boolean | no | <empty>   | Is start-tls-auto enabled?             |
-| gitlab_smtp_tls                  | boolean | no | <empty>   | Use TLS?                               |
-| gitlab_backup_keep_time          | number  | no | <empty>   | The duration in seconds to keep backups before they are allowed to be deleted |
-| gitlab_nginx_disable_hsts        | boolean | no | no        | If you are running your GitLab instance behind a reverse proxy you probably don't want to configure HSTS in GitLab |
-| gitlab_pages_enabled             | boolean | no | no        | Enables/Disables the Gitlab Pages feature |
-| gitlab_pages_port                | number  | no | 8081      | Defines the (internal) port used for Gitlab Pages |
-| gitlab_pages_external_port       | number  | yes |          | Defines the mapped port used for Gitlab Pages |
-| gitlab_pages_external_url        | url     | yes |          | Defines the URL used for Gitlab Pages |
-| gitlab_disable_prometheus        | boolean | no  |          | Disable prometheus exporter |
-| gitlab_sidekiq_concurrency       | number  | no  |          | Setup the number of sidekiq concurrency processes |
-| gitlab_state                     | text    | no  | `present` | Defines whether gitlab will be installed (`present`) or uninstalled (`absent`) |
+| Variable                         | Type          | Mandatory? | Default            | Description                                                                                                        |
+|----------------------------------|---------------|------------|--------------------|--------------------------------------------------------------------------------------------------------------------|
+| gitlab_image_name                | text          | no         | gitlab/gitlab-ce   | Docker image name                                                                                                  |
+| gitlab_image_version             | text          | no         | 12.9.2-ce.0        | Docker image version                                                                                               |
+| gitlab_interface                 | ip address    | no         | 0.0.0.0            | Mapped network for web-interface ports                                                                             |
+| gitlab_https_port                | port          | no         | 443                | Mapped HTTPS port                                                                                                  |
+| gitlab_http_port                 | port          | no         | 80                 | Mapped HTTP port                                                                                                   |
+| gitlab_ssh_port                  | port          | no         | 10022              | Mapped SSH port                                                                                                    |
+| gitlab_config_volume             | path          | no         | /srv/gitlab/config | Path to config volume                                                                                              |
+| gitlab_data_volume               | path          | no         | /srv/gitlab/data   | Path to data volume                                                                                                |
+| gitlab_log_volume                | path          | no         | /srv/gitlab/log    | Path to log volume                                                                                                 |
+| gitlab_backup_volume             | path          | no         | /srv/gitlab/backup | Path to backup volume                                                                                              |
+| gitlab_external_url              | url           | no         | <empty>            | Gitlab Url, like git.example.org                                                                                   |
+| gitlab_ssh_host                  | host          | no         | <empty>            | SSH Host, like ssh.example.org                                                                                     |
+| gitlab_shell_ssh_port            | host          | no         | <empty>            | Gitlab shell SSH port, like 10022                                                                                  |
+| gitlab_email_enabled             | boolean       | no         | false              | Is mailing enabled?                                                                                                |
+| gitlab_email_from                | email address | no         | <empty>            | Email from address                                                                                                 |
+| gitlab_email_display_name        | text          | no         | <empty>            | Email from name                                                                                                    |
+| gitlab_email_reply_to            | email address | no         | <empty>            | Reply email address                                                                                                |
+| gitlab_email_subject_suffix      | text          | no         | <empty>            | Suffix in email subject, like [GitLab]                                                                             |
+| gitlab_smtp_address              | host          | no         | <empty>            | SMTP server host                                                                                                   |
+| gitlab_smtp_port                 | port          | no         | <empty>            | SMTP server port                                                                                                   |
+| gitlab_smtp_user_name            | text          | no         | <empty>            | SMTP user name                                                                                                     |
+| gitlab_smtp_password             | text          | no         | <empty>            | SMTP password                                                                                                      |
+| gitlab_smtp_domain               | text          | no         | <empty>            | SMTP domain                                                                                                        |
+| gitlab_smtp_enable_starttls_auto | boolean       | no         | <empty>            | Is start-tls-auto enabled?                                                                                         |
+| gitlab_smtp_tls                  | boolean       | no         | <empty>            | Use TLS?                                                                                                           |
+| gitlab_backup_keep_time          | number        | no         | <empty>            | The duration in seconds to keep backups before they are allowed to be deleted                                      |
+| gitlab_nginx_disable_hsts        | boolean       | no         | no                 | If you are running your GitLab instance behind a reverse proxy you probably don't want to configure HSTS in GitLab |
+| gitlab_pages_enabled             | boolean       | no         | no                 | Enables/Disables the Gitlab Pages feature                                                                          |
+| gitlab_pages_port                | number        | no         | 8081               | Defines the (internal) port used for Gitlab Pages                                                                  |
+| gitlab_pages_external_port       | number        | yes        |                    | Defines the mapped port used for Gitlab Pages                                                                      |
+| gitlab_pages_external_url        | url           | yes        |                    | Defines the URL used for Gitlab Pages                                                                              |
+| gitlab_disable_prometheus        | boolean       | no         |                    | Disable prometheus exporter                                                                                        |
+| gitlab_sidekiq_concurrency       | number        | no         |                    | Setup the number of sidekiq concurrency processes                                                                  |
+| gitlab_state                     | text          | no         | `present`          | Defines whether gitlab will be installed (`present`) or uninstalled (`absent`)                                     |
 
 ## Usage
 

molecule/all-parameters/molecule.yml

@@ -3,6 +3,7 @@ dependency:
   name: galaxy
   options:
     role-file: ./molecule/default/requirements.yml
+    force: true
 
 lint: |
   set -e
@@ -13,16 +14,44 @@ driver:
   name: docker
 
 platforms:
-  - name: ansible-gitlab-focal
+  - name: docker-noble
+    image: docker.io/borisskert/python3:noble
+    pull: true
+    pre_build_image: true
+    volumes:
+      - '/var/run/docker.sock:/var/run/docker.sock'
+    groups:
+      - docker
+  - name: docker-jammy
+    image: docker.io/borisskert/python3:jammy
+    pull: true
+    pre_build_image: true
+    volumes:
+      - '/var/run/docker.sock:/var/run/docker.sock'
+    groups:
+      - docker
+  - name: docker-focal
     image: docker.io/borisskert/python3:focal
+    pull: true
+    pre_build_image: true
+    volumes:
+      - '/var/run/docker.sock:/var/run/docker.sock'
+    groups:
+      - docker
+
+  - name: docker-bookworm
+    image: docker.io/borisskert/python3:bookworm
+    pull: true
     pre_build_image: true
     volumes:
       - '/var/run/docker.sock:/var/run/docker.sock'
     groups:
       - docker
+      - debian
 
-  - name: ansible-gitlab-buster
-    image: docker.io/borisskert/python3:buster
+  - name: docker-bullseye
+    image: docker.io/borisskert/python3:bullseye
+    pull: true
     pre_build_image: true
     volumes:
       - '/var/run/docker.sock:/var/run/docker.sock'

molecule/default/molecule.yml

@@ -1,6 +1,9 @@
 ---
 dependency:
   name: galaxy
+  options:
+    role-file: ./molecule/default/requirements.yml
+    force: true
 
 lint: |
   set -e
@@ -11,16 +14,44 @@ driver:
   name: docker
 
 platforms:
-  - name: ansible-gitlab-focal
+  - name: docker-noble
+    image: docker.io/borisskert/python3:noble
+    pull: true
+    pre_build_image: true
+    volumes:
+      - '/var/run/docker.sock:/var/run/docker.sock'
+    groups:
+      - docker
+  - name: docker-jammy
+    image: docker.io/borisskert/python3:jammy
+    pull: true
+    pre_build_image: true
+    volumes:
+      - '/var/run/docker.sock:/var/run/docker.sock'
+    groups:
+      - docker
+  - name: docker-focal
     image: docker.io/borisskert/python3:focal
+    pull: true
+    pre_build_image: true
+    volumes:
+      - '/var/run/docker.sock:/var/run/docker.sock'
+    groups:
+      - docker
+
+  - name: docker-bookworm
+    image: docker.io/borisskert/python3:bookworm
+    pull: true
     pre_build_image: true
     volumes:
       - '/var/run/docker.sock:/var/run/docker.sock'
     groups:
       - docker
+      - debian
 
-  - name: ansible-gitlab-buster
-    image: docker.io/borisskert/python3:buster
+  - name: docker-bullseye
+    image: docker.io/borisskert/python3:bullseye
+    pull: true
     pre_build_image: true
     volumes:
       - '/var/run/docker.sock:/var/run/docker.sock'

molecule/default/requirements.yml

@@ -2,4 +2,4 @@
 - name: install-docker
   src: https://github.com/borisskert/ansible-docker.git
   scm: git
-  version: v20.07.24
+  version: v24.12.11

molecule/state-absent/molecule.yml

@@ -3,6 +3,7 @@ dependency:
   name: galaxy
   options:
     role-file: ./molecule/default/requirements.yml
+    force: true
 
 lint: |
   set -e
@@ -13,16 +14,44 @@ driver:
   name: docker
 
 platforms:
-  - name: ansible-gitlab-focal
+  - name: docker-noble
+    image: docker.io/borisskert/python3:noble
+    pull: true
+    pre_build_image: true
+    volumes:
+      - '/var/run/docker.sock:/var/run/docker.sock'
+    groups:
+      - docker
+  - name: docker-jammy
+    image: docker.io/borisskert/python3:jammy
+    pull: true
+    pre_build_image: true
+    volumes:
+      - '/var/run/docker.sock:/var/run/docker.sock'
+    groups:
+      - docker
+  - name: docker-focal
     image: docker.io/borisskert/python3:focal
+    pull: true
+    pre_build_image: true
+    volumes:
+      - '/var/run/docker.sock:/var/run/docker.sock'
+    groups:
+      - docker
+
+  - name: docker-bookworm
+    image: docker.io/borisskert/python3:bookworm
+    pull: true
     pre_build_image: true
     volumes:
       - '/var/run/docker.sock:/var/run/docker.sock'
     groups:
       - docker
+      - debian
 
-  - name: ansible-gitlab-buster
-    image: docker.io/borisskert/python3:buster
+  - name: docker-bullseye
+    image: docker.io/borisskert/python3:bullseye
+    pull: true
     pre_build_image: true
     volumes:
       - '/var/run/docker.sock:/var/run/docker.sock'

molecule/vagrant-all-parameters/molecule.yml

@@ -3,19 +3,34 @@ dependency:
   name: galaxy
   options:
     role-file: ./molecule/default/requirements.yml
+    force: true
 
 driver:
   name: vagrant
   provider:
     name: libvirt
 
 platforms:
+  - name: ansible-gitlab-noble
+    box: cloud-image/ubuntu-24.04
+    memory: 4096
+    cpus: 2
+  - name: ansible-gitlab-jammy
+    box: cloud-image/ubuntu-22.04
+    memory: 4096
+    cpus: 2
   - name: ansible-gitlab-focal
-    box: generic/ubuntu2004
+    box: cloud-image/ubuntu-20.04
     memory: 4096
     cpus: 2
-  - name: ansible-gitlab-buster
-    box: generic/debian10
+  - name: ansible-gitlab-bookworm
+    box: cloud-image/debian-12
+    memory: 4096
+    cpus: 2
+    groups:
+      - debian
+  - name: ansible-gitlab-bullseye
+    box: cloud-image/debian-11
     memory: 4096
     cpus: 2
     groups:

molecule/vagrant-state-absent/molecule.yml

@@ -3,19 +3,34 @@ dependency:
   name: galaxy
   options:
     role-file: ./molecule/default/requirements.yml
+    force: true
 
 driver:
   name: vagrant
   provider:
     name: libvirt
 
 platforms:
+  - name: ansible-gitlab-noble
+    box: cloud-image/ubuntu-24.04
+    memory: 4096
+    cpus: 2
+  - name: ansible-gitlab-jammy
+    box: cloud-image/ubuntu-22.04
+    memory: 4096
+    cpus: 2
   - name: ansible-gitlab-focal
-    box: generic/ubuntu2004
+    box: cloud-image/ubuntu-20.04
     memory: 4096
     cpus: 2
-  - name: ansible-gitlab-buster
-    box: generic/debian10
+  - name: ansible-gitlab-bookworm
+    box: cloud-image/debian-12
+    memory: 4096
+    cpus: 2
+    groups:
+      - debian
+  - name: ansible-gitlab-bullseye
+    box: cloud-image/debian-11
     memory: 4096
     cpus: 2
     groups: