From 2b613ce0f84b958fee5131fdcf7ba7e03c697e9b Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 10 Apr 2023 00:03:44 +0200 Subject: [PATCH] fix: use scaler resolved dns for docker daemon --- defaults/main.yml | 2 +- templates/services/userdata.yml.j2 | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 108ff84..e30dd78 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -50,7 +50,7 @@ droneci_autoscaler_agent_architecture: amd64 droneci_autoscaler_agent_distro: ubuntu droneci_autoscaler_agent_volumes: [] droneci_autoscaler_agent_package_upgrade: False -droneci_autoscaler_agent_resolved_dns: [] +droneci_autoscaler_agent_dns: [] droneci_autoscaler_agent_runcmd: [] # @var droneci_autoscaler_agent_packages:description: > diff --git a/templates/services/userdata.yml.j2 b/templates/services/userdata.yml.j2 index ef44c4b..54f81b8 100644 --- a/templates/services/userdata.yml.j2 +++ b/templates/services/userdata.yml.j2 @@ -48,7 +48,8 @@ write_files: "tlsverify": true, "tlscacert": "/etc/docker/ca.pem", "tlscert": "/etc/docker/server-cert.pem", - "tlskey": "/etc/docker/server-key.pem" + "tlskey": "/etc/docker/server-key.pem", + "dns": {{ droneci_autoscaler_agent_dns | to_json }} } {% if inst.docker_auth_config | default(droneci_autoscaler_docker_auth_config) is defined %} @@ -74,12 +75,12 @@ write_files: - path: /etc/docker/server-key.pem encoding: b64 content: {% raw %}{{ .TLSKey | base64 }}{% endraw %} - {% if droneci_autoscaler_agent_resolved_dns | length > 0 %} + {% if droneci_autoscaler_agent_dns | length > 0 %} - path: /etc/systemd/resolved.conf content: | [Resolve] - DNS={{ droneci_autoscaler_agent_resolved_dns | join(" ") }} + DNS={{ droneci_autoscaler_agent_dns | join(" ") }} {% endif %} {% if droneci_autoscaler_agent_runcmd | length > 0 %}