From 8248d716b6ec2fbd3ba067f87b4a76f4ac151aae Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 5 Jun 2023 22:04:10 +0200 Subject: [PATCH] feat: enable chrony-wait service (#2) Reviewed-on: https://gitea.rknet.org/ansible/xoxys.chrony/pulls/2 --- .drone.jsonnet | 8 +++--- .drone.yml | 9 +++--- molecule/default | 2 +- molecule/{rocky8 => rocky9}/converge.yml | 0 molecule/{rocky8 => rocky9}/create.yml | 2 +- molecule/{rocky8 => rocky9}/destroy.yml | 2 +- molecule/{rocky8 => rocky9}/molecule.yml | 4 +-- molecule/{rocky8 => rocky9}/prepare.yml | 0 .../{rocky8 => rocky9}/tests/test_default.py | 0 tasks/main.yml | 28 ++++++++++++++++++- .../time-sync.target.d/requires.conf.j2 | 4 +++ 11 files changed, 45 insertions(+), 14 deletions(-) rename molecule/{rocky8 => rocky9}/converge.yml (100%) rename molecule/{rocky8 => rocky9}/create.yml (99%) rename molecule/{rocky8 => rocky9}/destroy.yml (98%) rename molecule/{rocky8 => rocky9}/molecule.yml (91%) rename molecule/{rocky8 => rocky9}/prepare.yml (100%) rename molecule/{rocky8 => rocky9}/tests/test_default.py (100%) create mode 100644 templates/etc/systemd/system/time-sync.target.d/requires.conf.j2 diff --git a/.drone.jsonnet b/.drone.jsonnet index e1d8ce0..2f70f7e 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -41,7 +41,7 @@ local PipelineLinting = { }, }; -local PipelineDeployment(scenario='rocky8') = { +local PipelineDeployment(scenario='rocky9') = { kind: 'pipeline', name: 'testing-' + scenario, platform: { @@ -71,7 +71,7 @@ local PipelineDeployment(scenario='rocky8') = { '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-rocky8', + 'testing-rocky9', ], }; @@ -153,7 +153,7 @@ local PipelineNotification = { [ PipelineLinting, - PipelineDeployment(scenario='rocky8'), + PipelineDeployment(scenario='rocky9'), PipelineDocumentation, PipelineNotification, ] diff --git a/.drone.yml b/.drone.yml index 45f3445..ef3b89d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,7 +36,7 @@ trigger: --- kind: pipeline -name: testing-rocky8 +name: testing-rocky9 platform: os: linux @@ -53,7 +53,7 @@ steps: - name: ansible-molecule image: thegeeklab/molecule:4 commands: - - molecule test -s rocky8 + - 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-rocky8 + - testing-rocky9 --- kind: pipeline @@ -147,6 +148,6 @@ depends_on: --- kind: signature -hmac: 96908282833168a632002f8bf7c4be4f7577d84dad0016ca15e4232a64829650 +hmac: b7a44b7df8263dae322f071146976aa945dda4857876c3b98475dd725a6f28c6 ... diff --git a/molecule/default b/molecule/default index 70535ae..afa9fc6 120000 --- a/molecule/default +++ b/molecule/default @@ -1 +1 @@ -rocky8/ \ No newline at end of file +rocky9 \ No newline at end of file diff --git a/molecule/rocky8/converge.yml b/molecule/rocky9/converge.yml similarity index 100% rename from molecule/rocky8/converge.yml rename to molecule/rocky9/converge.yml diff --git a/molecule/rocky8/create.yml b/molecule/rocky9/create.yml similarity index 99% rename from molecule/rocky8/create.yml rename to molecule/rocky9/create.yml index 8b945cd..719600d 100644 --- a/molecule/rocky8/create.yml +++ b/molecule/rocky9/create.yml @@ -117,4 +117,4 @@ - name: Wait for VM to settle down pause: - seconds: 30 + seconds: 30 \ No newline at end of file diff --git a/molecule/rocky8/destroy.yml b/molecule/rocky9/destroy.yml similarity index 98% rename from molecule/rocky8/destroy.yml rename to molecule/rocky9/destroy.yml index 6454c71..ed0b2ed 100644 --- a/molecule/rocky8/destroy.yml +++ b/molecule/rocky9/destroy.yml @@ -75,4 +75,4 @@ {{ instance_conf | to_nice_yaml(indent=2) }} dest: "{{ molecule_instance_config }}" - when: server.changed | bool + when: server.changed | bool \ No newline at end of file diff --git a/molecule/rocky8/molecule.yml b/molecule/rocky9/molecule.yml similarity index 91% rename from molecule/rocky8/molecule.yml rename to molecule/rocky9/molecule.yml index 67a0d91..12f195e 100644 --- a/molecule/rocky8/molecule.yml +++ b/molecule/rocky9/molecule.yml @@ -9,8 +9,8 @@ dependency: driver: name: delegated platforms: - - name: rocky8-chrony - image: rocky-8 + - name: rocky9-wireguard + image: rocky-9 server_type: cx11 lint: | /usr/local/bin/flake8 diff --git a/molecule/rocky8/prepare.yml b/molecule/rocky9/prepare.yml similarity index 100% rename from molecule/rocky8/prepare.yml rename to molecule/rocky9/prepare.yml diff --git a/molecule/rocky8/tests/test_default.py b/molecule/rocky9/tests/test_default.py similarity index 100% rename from molecule/rocky8/tests/test_default.py rename to molecule/rocky9/tests/test_default.py diff --git a/tasks/main.yml b/tasks/main.yml index d50b26b..05a1648 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -5,6 +5,17 @@ name: chrony state: present + - name: Create required directories + loop: + - name: /etc/systemd/system/time-sync.target.d + mode: "0755" + loop_control: + label: "{{ item.name }}" + file: + path: "{{ item.name }}" + state: directory + mode: "{{ item.mode }}" + - name: Deploy configuration file template: src: etc/chrony.conf.j2 @@ -23,11 +34,26 @@ mode: 0644 notify: __chrony_restart - - name: Ensure service is up and running + - name: Deploy time-sync.target override file + template: + src: etc/systemd/system/time-sync.target.d/requires.conf.j2 + dest: /etc/systemd/system/time-sync.target.d/requires.conf + owner: root + group: root + mode: 0644 + notify: __chrony_restart + + - name: Ensure chronyd is up and running systemd: name: chronyd.service state: started daemon_reload: True enabled: True + + - name: Ensure chrony-wait is enabled + systemd: + name: chrony-wait.service + daemon_reload: True + enabled: True become: True become_user: root diff --git a/templates/etc/systemd/system/time-sync.target.d/requires.conf.j2 b/templates/etc/systemd/system/time-sync.target.d/requires.conf.j2 new file mode 100644 index 0000000..f197fd7 --- /dev/null +++ b/templates/etc/systemd/system/time-sync.target.d/requires.conf.j2 @@ -0,0 +1,4 @@ +#jinja2: lstrip_blocks: True +{{ ansible_managed | comment }} +[Unit] +Requires=chrony-wait.service