From 7fc0fdce9bce3a110ac1e55cc457106f404ff4ad Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 5 Jun 2023 22:15:30 +0200 Subject: [PATCH 1/5] feat: add option to add custom unit override options --- .drone.jsonnet | 6 +++--- .drone.yml | 8 ++++---- defaults/main.yml | 5 +++-- molecule/{centos7 => rocky9}/converge.yml | 4 ++-- molecule/{centos7 => rocky9}/create.yml | 0 molecule/{centos7 => rocky9}/destroy.yml | 0 molecule/{centos7 => rocky9}/molecule.yml | 0 molecule/{centos7 => rocky9}/prepare.yml | 0 molecule/{centos7 => rocky9}/tests/test_default.py | 0 tasks/install.yml | 2 +- templates/etc/sysconfig/docker.j2 | 1 + .../etc/systemd/system/docker.service.d/override.conf.j2 | 7 +++++++ 12 files changed, 21 insertions(+), 12 deletions(-) rename molecule/{centos7 => rocky9}/converge.yml (74%) rename molecule/{centos7 => rocky9}/create.yml (100%) rename molecule/{centos7 => rocky9}/destroy.yml (100%) rename molecule/{centos7 => rocky9}/molecule.yml (100%) rename molecule/{centos7 => rocky9}/prepare.yml (100%) rename molecule/{centos7 => rocky9}/tests/test_default.py (100%) diff --git a/.drone.jsonnet b/.drone.jsonnet index bf6e5ab..ba03bb6 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -41,7 +41,7 @@ local PipelineLinting = { }, }; -local PipelineDeployment(scenario='centos7') = { +local PipelineDeployment(scenario='rocky9') = { kind: 'pipeline', name: 'testing-' + scenario, platform: { @@ -115,7 +115,7 @@ local PipelineDocumentation = { ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, depends_on: [ - 'testing-centos7', + 'testing-rocky9', ], }; @@ -153,7 +153,7 @@ local PipelineNotification = { [ PipelineLinting, - PipelineDeployment(scenario='centos7'), + PipelineDeployment(scenario='rocky9'), PipelineDocumentation, PipelineNotification, ] diff --git a/.drone.yml b/.drone.yml index d8f0bef..778f1bb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,7 +36,7 @@ trigger: --- kind: pipeline -name: testing-centos7 +name: testing-rocky9 platform: os: linux @@ -53,7 +53,7 @@ steps: - name: ansible-molecule image: thegeeklab/molecule:4 commands: - - molecule test -s centos7 + - molecule test -s rocky9 environment: HCLOUD_TOKEN: from_secret: hcloud_token @@ -107,7 +107,7 @@ trigger: - refs/pull/** depends_on: - - testing-centos7 + - testing-rocky9 --- kind: pipeline @@ -147,6 +147,6 @@ depends_on: --- kind: signature -hmac: 07e123ae54fb79836d48b0fee57666759de62d8e85a94d9386179e636b2235e3 +hmac: 9937973aed8a030a7c7d74909473f0424bea63aad70049727a2925b10d00aac2 ... diff --git a/defaults/main.yml b/defaults/main.yml index 8a50301..84a1d77 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -13,11 +13,12 @@ dockerengine_packages: dockerengine_packages_extra: [] docker_ansible_deps: - - cryptography~=2.0 - - docker-compose~=1.24.0 + - cryptography + - docker-compose - docker dockerengine_service: docker +dockerengine_service_override_unit: [] dockerengine_docker_group_enabled: False diff --git a/molecule/centos7/converge.yml b/molecule/rocky9/converge.yml similarity index 74% rename from molecule/centos7/converge.yml rename to molecule/rocky9/converge.yml index 48c685e..eef6af8 100644 --- a/molecule/centos7/converge.yml +++ b/molecule/rocky9/converge.yml @@ -4,8 +4,8 @@ vars: dockerengine_packages_extra: - epel-release - - python-pip - - python-virtualenv + - python3-pip + - python3-virtualenv roles: - role: xoxys.docker_engine diff --git a/molecule/centos7/create.yml b/molecule/rocky9/create.yml similarity index 100% rename from molecule/centos7/create.yml rename to molecule/rocky9/create.yml diff --git a/molecule/centos7/destroy.yml b/molecule/rocky9/destroy.yml similarity index 100% rename from molecule/centos7/destroy.yml rename to molecule/rocky9/destroy.yml diff --git a/molecule/centos7/molecule.yml b/molecule/rocky9/molecule.yml similarity index 100% rename from molecule/centos7/molecule.yml rename to molecule/rocky9/molecule.yml diff --git a/molecule/centos7/prepare.yml b/molecule/rocky9/prepare.yml similarity index 100% rename from molecule/centos7/prepare.yml rename to molecule/rocky9/prepare.yml diff --git a/molecule/centos7/tests/test_default.py b/molecule/rocky9/tests/test_default.py similarity index 100% rename from molecule/centos7/tests/test_default.py rename to molecule/rocky9/tests/test_default.py diff --git a/tasks/install.yml b/tasks/install.yml index 0f96d0d..981974c 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -20,7 +20,7 @@ pip: name: "{{ item }}" virtualenv: /opt/python2/ansible-deps - loop: "{{ docker_ansible_deps }}" + loop: "{{ dockerengine_ansible_deps }}" - name: Add docker-compose wrapper template: diff --git a/templates/etc/sysconfig/docker.j2 b/templates/etc/sysconfig/docker.j2 index 49eb121..2c4d193 100644 --- a/templates/etc/sysconfig/docker.j2 +++ b/templates/etc/sysconfig/docker.j2 @@ -1,3 +1,4 @@ +#jinja2: lstrip_blocks: True {{ ansible_managed | comment }} OPTIONS='{{'--userns-remap=' + dockerengine_nsremap_user + ':' + dockerengine_nsremap_user if dockerengine_usernamespace_enabled | bool else '' }}' diff --git a/templates/etc/systemd/system/docker.service.d/override.conf.j2 b/templates/etc/systemd/system/docker.service.d/override.conf.j2 index 0a37281..85ea03c 100644 --- a/templates/etc/systemd/system/docker.service.d/override.conf.j2 +++ b/templates/etc/systemd/system/docker.service.d/override.conf.j2 @@ -1,3 +1,10 @@ +#jinja2: lstrip_blocks: True +{{ ansible_managed | comment }} +{% if dockerengine_service_override_unit | default([]) | length > 0 %} +[Unit] +{% for item in dockerengine_service_override_unit %} +{{ item }} +{% endfor %} [Service] EnvironmentFile=-/etc/sysconfig/docker ExecStart= -- 2.24.4 From 38e429dfd077297b59d065b7ad730cc703e42a25 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 5 Jun 2023 22:17:47 +0200 Subject: [PATCH 2/5] fix ci trigger and var name --- .drone.jsonnet | 2 +- defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index ba03bb6..2f70f7e 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -71,7 +71,7 @@ local PipelineDeployment(scenario='rocky9') = { 'linting', ], trigger: { - ref: ['refs/heads/main', 'refs/tags/**'], + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, }; diff --git a/defaults/main.yml b/defaults/main.yml index 84a1d77..6fccb37 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -12,7 +12,7 @@ dockerengine_packages: # @end dockerengine_packages_extra: [] -docker_ansible_deps: +dockerengine_ansible_deps: - cryptography - docker-compose - docker -- 2.24.4 From e1b77028cb1720366173ed13b9d2b9cece29b511 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 5 Jun 2023 22:19:24 +0200 Subject: [PATCH 3/5] fix base image --- .drone.yml | 3 ++- molecule/rocky9/molecule.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 778f1bb..1523b7a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -62,6 +62,7 @@ trigger: ref: - refs/heads/main - refs/tags/** + - refs/pull/** depends_on: - linting @@ -147,6 +148,6 @@ depends_on: --- kind: signature -hmac: 9937973aed8a030a7c7d74909473f0424bea63aad70049727a2925b10d00aac2 +hmac: 5ecb808a24d61708adad225a6fd1ffde1b8de1a477f513e21c5e2b14c3790e0d ... diff --git a/molecule/rocky9/molecule.yml b/molecule/rocky9/molecule.yml index 8218ea9..0539eeb 100644 --- a/molecule/rocky9/molecule.yml +++ b/molecule/rocky9/molecule.yml @@ -9,8 +9,8 @@ dependency: driver: name: delegated platforms: - - name: centos7-docker-engine - image: centos-7 + - name: rocky9-docker-engine + image: rocky-9 server_type: cx11 lint: | /usr/local/bin/flake8 -- 2.24.4 From d483d01ff65e287f230143e6211ecd4c73460f7f Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 5 Jun 2023 22:28:18 +0200 Subject: [PATCH 4/5] enable crb repo during molecule runs --- molecule/rocky9/converge.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/molecule/rocky9/converge.yml b/molecule/rocky9/converge.yml index eef6af8..cea0524 100644 --- a/molecule/rocky9/converge.yml +++ b/molecule/rocky9/converge.yml @@ -6,6 +6,9 @@ - epel-release - python3-pip - python3-virtualenv - + pre_tasks: + - name: Enable CodeReadyBuilder repository + command: dnf config-manager --set-enabled "crb" + changed_when: False roles: - role: xoxys.docker_engine -- 2.24.4 From 537ef1c2fcbf6361f6a044e454915587d567dccf Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 5 Jun 2023 22:43:15 +0200 Subject: [PATCH 5/5] use multiline string for dockerengine_service_override_unit --- defaults/main.yml | 11 ++++++++++- .../systemd/system/docker.service.d/override.conf.j2 | 7 +++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 6fccb37..d6e482c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -18,7 +18,16 @@ dockerengine_ansible_deps: - docker dockerengine_service: docker -dockerengine_service_override_unit: [] + +# @var dockerengine_service_override_unit:description: > +# Multiline string of options to add to the `systemd` service override unit section. +# @end +# @var dockerengine_service_override_unit: $ "_unset_" +# @var dockerengine_service_override_unit:example: > +# dockerengine_service_override_unit: | +# After=time-sync.target +# Requires=time-sync.target +# @end dockerengine_docker_group_enabled: False diff --git a/templates/etc/systemd/system/docker.service.d/override.conf.j2 b/templates/etc/systemd/system/docker.service.d/override.conf.j2 index 85ea03c..7d51f7c 100644 --- a/templates/etc/systemd/system/docker.service.d/override.conf.j2 +++ b/templates/etc/systemd/system/docker.service.d/override.conf.j2 @@ -1,10 +1,9 @@ #jinja2: lstrip_blocks: True {{ ansible_managed | comment }} -{% if dockerengine_service_override_unit | default([]) | length > 0 %} +{% if dockerengine_service_override_unit is defined %} [Unit] -{% for item in dockerengine_service_override_unit %} -{{ item }} -{% endfor %} +{{ dockerengine_service_override_unit }} +{% endif %} [Service] EnvironmentFile=-/etc/sysconfig/docker ExecStart= -- 2.24.4