From e9e83d2f8dcac5059bd0e10272148cbcc2340fb1 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 5 Jun 2023 22:55:25 +0200 Subject: [PATCH] feat: add option to add custom unit override options (#5) Reviewed-on: https://gitea.rknet.org/ansible/xoxys.docker_engine/pulls/5 --- .drone.jsonnet | 8 ++++---- .drone.yml | 9 +++++---- defaults/main.yml | 16 +++++++++++++--- molecule/centos7/converge.yml | 11 ----------- molecule/rocky9/converge.yml | 14 ++++++++++++++ molecule/{centos7 => rocky9}/create.yml | 0 molecule/{centos7 => rocky9}/destroy.yml | 0 molecule/{centos7 => rocky9}/molecule.yml | 4 ++-- molecule/{centos7 => rocky9}/prepare.yml | 0 .../{centos7 => rocky9}/tests/test_default.py | 0 tasks/install.yml | 2 +- templates/etc/sysconfig/docker.j2 | 1 + .../system/docker.service.d/override.conf.j2 | 6 ++++++ 13 files changed, 46 insertions(+), 25 deletions(-) delete mode 100644 molecule/centos7/converge.yml create mode 100644 molecule/rocky9/converge.yml rename molecule/{centos7 => rocky9}/create.yml (100%) rename molecule/{centos7 => rocky9}/destroy.yml (100%) rename molecule/{centos7 => rocky9}/molecule.yml (90%) 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..2f70f7e 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: { @@ -71,7 +71,7 @@ local PipelineDeployment(scenario='centos7') = { 'linting', ], trigger: { - ref: ['refs/heads/main', 'refs/tags/**'], + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, }; @@ -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..1523b7a 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 @@ -62,6 +62,7 @@ trigger: ref: - refs/heads/main - refs/tags/** + - refs/pull/** depends_on: - linting @@ -107,7 +108,7 @@ trigger: - refs/pull/** depends_on: - - testing-centos7 + - testing-rocky9 --- kind: pipeline @@ -147,6 +148,6 @@ depends_on: --- kind: signature -hmac: 07e123ae54fb79836d48b0fee57666759de62d8e85a94d9386179e636b2235e3 +hmac: 5ecb808a24d61708adad225a6fd1ffde1b8de1a477f513e21c5e2b14c3790e0d ... diff --git a/defaults/main.yml b/defaults/main.yml index 8a50301..d6e482c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -12,13 +12,23 @@ dockerengine_packages: # @end dockerengine_packages_extra: [] -docker_ansible_deps: - - cryptography~=2.0 - - docker-compose~=1.24.0 +dockerengine_ansible_deps: + - cryptography + - docker-compose - docker dockerengine_service: docker +# @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 # @var dockerengine_registries:description: List of docker registries to auto login diff --git a/molecule/centos7/converge.yml b/molecule/centos7/converge.yml deleted file mode 100644 index 48c685e..0000000 --- a/molecule/centos7/converge.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: Converge - hosts: all - vars: - dockerengine_packages_extra: - - epel-release - - python-pip - - python-virtualenv - - roles: - - role: xoxys.docker_engine diff --git a/molecule/rocky9/converge.yml b/molecule/rocky9/converge.yml new file mode 100644 index 0000000..cea0524 --- /dev/null +++ b/molecule/rocky9/converge.yml @@ -0,0 +1,14 @@ +--- +- name: Converge + hosts: all + vars: + dockerengine_packages_extra: + - 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 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 90% rename from molecule/centos7/molecule.yml rename to molecule/rocky9/molecule.yml index 8218ea9..0539eeb 100644 --- a/molecule/centos7/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 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..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,3 +1,9 @@ +#jinja2: lstrip_blocks: True +{{ ansible_managed | comment }} +{% if dockerengine_service_override_unit is defined %} +[Unit] +{{ dockerengine_service_override_unit }} +{% endif %} [Service] EnvironmentFile=-/etc/sysconfig/docker ExecStart=