From e425b01c98f1aa596c59a608e2765ccdb853e4cf Mon Sep 17 00:00:00 2001
From: Karel Simon <ksimon@redhat.com>
Date: Wed, 20 May 2020 07:59:06 +0200
Subject: [PATCH] remove conroe cpu model from ubuntu template

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1837670

When creating a VM using the VM Wizard in the OpenShift Web Console,
if a user choose "Ubuntu 18.04 LTS", template forces Conroe CPU model.
This results in VM being unschedulable if node doesn't have label with
this cpu model.

Signed-off-by: Karel Simon <ksimon@redhat.com>
---
 generate-templates.yaml   | 1 -
 templates/ubuntu.tpl.yaml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/generate-templates.yaml b/generate-templates.yaml
index 312bef5f..175c9be9 100644
--- a/generate-templates.yaml
+++ b/generate-templates.yaml
@@ -205,7 +205,6 @@
     - {flavor: medium, workload: desktop, memsize: "4Gi", cpus: 1, iothreads: False, tablet: True}
     - {flavor: large, workload: desktop, memsize: "8Gi", cpus: 2, iothreads: False, tablet: True}
     vars:
-      cpumodel: Conroe
       os: ubuntu
       icon: ubuntu
       password: ubuntu
diff --git a/templates/ubuntu.tpl.yaml b/templates/ubuntu.tpl.yaml
index b172c180..6890ac79 100644
--- a/templates/ubuntu.tpl.yaml
+++ b/templates/ubuntu.tpl.yaml
@@ -1,7 +1,7 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: {{ os }}-{{ item.workload }}-{{ item.flavor }}-v0.7.0
+  name: {{ os }}-{{ item.workload }}-{{ item.flavor }}-v0.11.0
   annotations:
     openshift.io/display-name: "Ubuntu 18.04 (Xenial Xerus) VM"
     description: >-