From d3c0fe1fcb2a2a9b41a29256c4c0b210b86c2731 Mon Sep 17 00:00:00 2001
From: Erwan Miran <mirwan666@gmail.com>
Date: Mon, 13 Aug 2018 09:51:26 +0200
Subject: [PATCH] Templates (even without actual templating inside) should have
j2 extension but should not be rendered with j2 extension
---
roles/dnsmasq/tasks/main.yml | 6 +++---
...terrolebinding.yml => dnsmasq-clusterrolebinding.yml.j2} | 0
.../templates/{dnsmasq-deploy.yml => dnsmasq-deploy.yml.j2} | 0
...asq-serviceaccount.yml => dnsmasq-serviceaccount.yml.j2} | 0
.../templates/{dnsmasq-svc.yml => dnsmasq-svc.yml.j2} | 0
5 files changed, 3 insertions(+), 3 deletions(-)
rename roles/dnsmasq/templates/{dnsmasq-clusterrolebinding.yml => dnsmasq-clusterrolebinding.yml.j2} (100%)
rename roles/dnsmasq/templates/{dnsmasq-deploy.yml => dnsmasq-deploy.yml.j2} (100%)
rename roles/dnsmasq/templates/{dnsmasq-serviceaccount.yml => dnsmasq-serviceaccount.yml.j2} (100%)
rename roles/dnsmasq/templates/{dnsmasq-svc.yml => dnsmasq-svc.yml.j2} (100%)
diff --git a/roles/dnsmasq/tasks/main.yml b/roles/dnsmasq/tasks/main.yml
index 8fbd547b4..cbaee32d7 100644
--- a/roles/dnsmasq/tasks/main.yml
+++ b/roles/dnsmasq/tasks/main.yml
@@ -54,7 +54,7 @@
- name: Create dnsmasq RBAC manifests
template:
- src: "{{ item }}"
+ src: "{{ item }}.j2"
dest: "{{ kube_config_dir }}/{{ item }}"
with_items:
- "dnsmasq-clusterrolebinding.yml"
@@ -74,12 +74,12 @@
- name: Create dnsmasq manifests
template:
- src: "{{item.file}}"
+ src: "{{item.file}}.j2"
dest: "{{kube_config_dir}}/{{item.file}}"
with_items:
- {name: dnsmasq, file: dnsmasq-deploy.yml, type: deployment}
- {name: dnsmasq, file: dnsmasq-svc.yml, type: svc}
- - {name: dnsmasq-autoscaler, file: dnsmasq-autoscaler.yml.j2, type: deployment}
+ - {name: dnsmasq-autoscaler, file: dnsmasq-autoscaler.yml, type: deployment}
register: manifests
delegate_to: "{{ groups['kube-master'][0] }}"
run_once: true
diff --git a/roles/dnsmasq/templates/dnsmasq-clusterrolebinding.yml b/roles/dnsmasq/templates/dnsmasq-clusterrolebinding.yml.j2
similarity index 100%
rename from roles/dnsmasq/templates/dnsmasq-clusterrolebinding.yml
rename to roles/dnsmasq/templates/dnsmasq-clusterrolebinding.yml.j2
diff --git a/roles/dnsmasq/templates/dnsmasq-deploy.yml b/roles/dnsmasq/templates/dnsmasq-deploy.yml.j2
similarity index 100%
rename from roles/dnsmasq/templates/dnsmasq-deploy.yml
rename to roles/dnsmasq/templates/dnsmasq-deploy.yml.j2
diff --git a/roles/dnsmasq/templates/dnsmasq-serviceaccount.yml b/roles/dnsmasq/templates/dnsmasq-serviceaccount.yml.j2
similarity index 100%
rename from roles/dnsmasq/templates/dnsmasq-serviceaccount.yml
rename to roles/dnsmasq/templates/dnsmasq-serviceaccount.yml.j2
diff --git a/roles/dnsmasq/templates/dnsmasq-svc.yml b/roles/dnsmasq/templates/dnsmasq-svc.yml.j2
similarity index 100%
rename from roles/dnsmasq/templates/dnsmasq-svc.yml
rename to roles/dnsmasq/templates/dnsmasq-svc.yml.j2
--
GitLab