From 4ca081b974e304b08e2fd6e370202968eb7ad3da Mon Sep 17 00:00:00 2001
From: David Critch <dcritch@redhat.com>
Date: Fri, 15 Jun 2018 16:24:41 -0400
Subject: [PATCH] update deprovision task to use jinja2 template (#286)

---
 roles/kubevirt/tasks/deprovision.yml | 36 ++++++++++++----------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/roles/kubevirt/tasks/deprovision.yml b/roles/kubevirt/tasks/deprovision.yml
index 6bc98c343..37938af64 100644
--- a/roles/kubevirt/tasks/deprovision.yml
+++ b/roles/kubevirt/tasks/deprovision.yml
@@ -5,37 +5,31 @@
         and admin_user is defined
         and admin_password is defined
 
-- name: Check for kubevirt.yml template in {{ kubevirt_template_dir }}
+- name: Check that kubevirt.yaml still exists in /tmp
   stat:
-    path: "{{ kubevirt_template_dir }}/kubevirt.yml"
-  register: byo_template
-
-- name: Render BYO template
-  template:
-    src: "{{ kubevirt_template_dir }}/kubevirt.yml"
-    dest: /tmp/kubevirt.yml
-  when: byo_template.stat.exists == True
+    path: "/tmp/kubevirt.yaml"
+  register: kubevirt_template
 
-- name: Check that kubevirt.yml still exists in /tmp
+- name: Check for kubevirt.yml.j2 template in {{ kubevirt_template_dir }}
   stat:
-    path: "/tmp/kubevirt.yml"
-  register: kubevirt_template
+    path: "{{ kubevirt_template_dir }}/kubevirt.yaml.j2"
+  register: byo_template
+  when: kubevirt_template.stat.exists == False
 
 - name: Download KubeVirt Template
   get_url:
-    url: "{{ release_manifest_url }}/v{{ version }}/kubevirt.yaml"
-    dest: "/tmp/kubevirt.yml"
-  when: kubevirt_template.stat.exists == False
+    url: "{{ release_manifest_url }}/v{{ version }}/kubevirt.yaml.j2"
+    dest: "{{ kubevirt_template_dir }}/kubevirt.yaml.j2"
+  when: (kubevirt_template.stat.exists == False) and (byo_template.stat.exists == False)
 
-- name: Render KubeVirt Yml
-  replace:
-    path: "/tmp/kubevirt.yml"
-    regexp: "namespace: kube-system"
-    replace: "namespace: {{ namespace }}"
+- name: Render KubeVirt template
+  template:
+    src: "kubevirt.yaml.j2"
+    dest: "/tmp/kubevirt.yaml"
   when: kubevirt_template.stat.exists == False
 
 - name: Delete KubeVirt Resources
-  command: kubectl delete -f /tmp/kubevirt.yml --ignore-not-found=true
+  command: kubectl delete -f /tmp/kubevirt.yaml --ignore-not-found=true
 
 - name: Delete Privileged Policy
   command: "oc adm policy remove-scc-from-user privileged -z {{ item }} -n {{ namespace }}"