From f137a749f098824f3f7bec06f9335c2b14ea856a Mon Sep 17 00:00:00 2001
From: Shweta <spadubid@redhat.com>
Date: Wed, 30 Sep 2020 04:43:32 -0400
Subject: [PATCH] Add the Major Release of an OS to every template (#227)

Signed-off-by: Shweta Padubidri <spadubid@redhat.com>
---
 generate-templates.yaml | 9 +++++++++
 templates/_linux.yaml   | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/generate-templates.yaml b/generate-templates.yaml
index 221cde85..e2c3109c 100644
--- a/generate-templates.yaml
+++ b/generate-templates.yaml
@@ -32,6 +32,7 @@
     vars:
       os: rhel8
       icon: rhel
+      majorrelease: rhel8
       oslabels: "{{ rhel8_labels }}"
       osinfoname: "{{ oslabels[0] }}"
       cloudusername: cloud-user
@@ -60,6 +61,7 @@
     vars:
       os: rhel7
       icon: rhel
+      majorrelease: rhel7
       oslabels: "{{ rhel7_labels }}"
       osinfoname: "{{ oslabels[0] }}"
       cloudusername: cloud-user
@@ -84,6 +86,7 @@
     vars:
       os: rhel6
       icon: rhel
+      majorrelease: rhel6
       oslabels: "{{ rhel6_labels }}"
       osinfoname: "{{ oslabels[0] }}"
       cloudusername: cloud-user
@@ -104,6 +107,7 @@
     vars:
       os: centos8
       icon: centos
+      majorrelease: centos8
       oslabels:
        - centos8
       osinfoname: "{{ oslabels[0] }}"
@@ -125,6 +129,7 @@
     vars:
       os: centos7
       icon: centos
+      majorrelease: centos7
       oslabels:
        - centos7.0
       osinfoname: "{{ oslabels[0] }}"
@@ -146,6 +151,7 @@
     vars:
       os: centos6
       icon: centos
+      majorrelease: centos6
       oslabels: "{{ centos6_labels }}"
       osinfoname: "{{ oslabels[0] }}"
       cloudusername: centos
@@ -174,6 +180,7 @@
     vars:
       os: fedora
       icon: fedora
+      majorrelease: fedora32
       oslabels: "{{ fedora_labels }}"
       osinfoname: "{{ oslabels[0] }}"
       cloudusername: fedora
@@ -190,6 +197,7 @@
     vars:
       os: opensuse
       icon: opensuse
+      majorrelease: opensuse15
       oslabels:
        - opensuse15.0
       osinfoname: "{{ oslabels[0] }}"
@@ -208,6 +216,7 @@
     vars:
       os: ubuntu
       icon: ubuntu
+      majorrelease: ubuntu18
       oslabels:
        - ubuntu18.04
       osinfoname: "{{ oslabels[0] }}"
diff --git a/templates/_linux.yaml b/templates/_linux.yaml
index 48a8e97c..a020581e 100644
--- a/templates/_linux.yaml
+++ b/templates/_linux.yaml
@@ -117,7 +117,7 @@ parameters:
   required: true
 - name: SRC_PVC_NAME
   description: Name of the PVC to clone
-  value: '{{ oslabels | last }}'
+  value: '{{ majorrelease }}'
 - name: SRC_PVC_NAMESPACE
   description: Namespace of the source PVC
   value: kubevirt-os-images