fix(systemd): updated unit file

This commit is contained in:
Xan Manning 2022-09-11 10:35:44 +01:00
parent 8410d2c402
commit 01616dcd96
No known key found for this signature in database
GPG key ID: FEBA410BBAD454FF
3 changed files with 6 additions and 3 deletions

View file

@ -46,7 +46,7 @@ jobs:
- distro: xanmanning/docker-alpine-ansible:3.16 - distro: xanmanning/docker-alpine-ansible:3.16
scenario: highavailabilityetcd scenario: highavailabilityetcd
prebuilt: 'false' prebuilt: 'false'
- distro: geerlingguy/docker-rockylinux8-ansible:latest - distro: geerlingguy/docker-rockylinux9-ansible:latest
scenario: highavailabilityetcd scenario: highavailabilityetcd
prebuilt: 'true' prebuilt: 'true'

View file

@ -5,15 +5,17 @@
become: true become: true
vars: vars:
molecule_is_test: true molecule_is_test: true
k3s_release_version: "v1.21"
k3s_use_experimental: true k3s_use_experimental: true
k3s_etcd_datastore: true k3s_etcd_datastore: true
k3s_server: k3s_server:
secrets-encryption: true secrets-encryption: true
k3s_agent: k3s_agent:
node-ip: "{{ ansible_default_ipv4.address }}" node-ip: "{{ ansible_default_ipv4.address }}"
# snapshotter: native snapshotter: native
selinux: "{{ ansible_os_family | lower == 'redhat' }}"
k3s_skip_validation: "{{ k3s_service_handler[ansible_service_mgr] == 'service' }}" k3s_skip_validation: "{{ k3s_service_handler[ansible_service_mgr] == 'service' }}"
k3s_skip_post_checks: "{{ ansible_os_family | lower == 'redhat' }}" # k3s_skip_post_checks: "{{ ansible_os_family | lower == 'redhat' }}"
pre_tasks: pre_tasks:
- name: Set each node to be a control node - name: Set each node to be a control node
ansible.builtin.set_fact: ansible.builtin.set_fact:

View file

@ -26,6 +26,7 @@ Environment={{ env_var }}="{{ k3s_service_env_vars[env_var] }}"
{% if k3s_service_env_file is defined and k3s_service_env_file %} {% if k3s_service_env_file is defined and k3s_service_env_file %}
EnvironmentFile={{ k3s_service_env_file }} EnvironmentFile={{ k3s_service_env_file }}
{% endif %} {% endif %}
ExecStartPre=/bin/sh -xc '! /usr/bin/systemctl is-enabled --quiet nm-cloud-setup.service'
ExecStartPre=-/sbin/modprobe br_netfilter ExecStartPre=-/sbin/modprobe br_netfilter
ExecStartPre=-/sbin/modprobe overlay ExecStartPre=-/sbin/modprobe overlay
{% filter regex_replace('\s+', ' ') %} {% filter regex_replace('\s+', ' ') %}