From f68a5feb2e7bd0c0603b4ec2ddc43b7742842240 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Sun, 6 Dec 2020 15:44:48 +0100
Subject: [PATCH] remove pre-defined runner volumes

---
 templates/services/droneci_autoscaler_compose.yml.j2 | 4 +++-
 vars/main.yml                                        | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 vars/main.yml

diff --git a/templates/services/droneci_autoscaler_compose.yml.j2 b/templates/services/droneci_autoscaler_compose.yml.j2
index 191e05a..d99efe1 100644
--- a/templates/services/droneci_autoscaler_compose.yml.j2
+++ b/templates/services/droneci_autoscaler_compose.yml.j2
@@ -56,7 +56,9 @@ services:
       {% if inst.api_host is defined %}
       - DRONE_HTTP_HOST={{ inst.api_host }}
       {% endif %}
-      - DRONE_RUNNER_VOLUMES={{ (__droneci_autoscaler_runner_volumes + (inst.runner_volumes | default(droneci_autoscaler_runner_volumes))) | join(",") }}
+      {% if inst.runner_volumes | default(droneci_autoscaler_runner_volumes) | default(False) %}
+      - DRONE_RUNNER_VOLUMES={{ inst.runner_volumes | default(droneci_autoscaler_runner_volumes) | join(",") }}
+      {% endif %}
       - DRONE_RUNNER_PRIVILEGED_IMAGES={{ inst.runner_privileged | default(droneci_autoscaler_runner_privileged) | join(",") }}
       - DRONE_RUNNER_ENV_FILE={{ inst.runner_env_file | default(droneci_autoscaler_runner_env_file) }}
       - DRONE_GC_ENABLED={{ (inst.gc_enabled | default(droneci_autoscaler_gc_enabled)) | bool | lower }}
diff --git a/vars/main.yml b/vars/main.yml
deleted file mode 100644
index 7829b50..0000000
--- a/vars/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-__droneci_autoscaler_runner_volumes:
-  - "/etc/drone.conf:/etc/drone.conf"