Merge pull request #152 from ksimon1/remove-conroe-cpu-model

remove conroe cpu model from ubuntu template
kubevirt · May 20, 2020 · acf1548 · acf1548
2 parents 7034407 + e425b01
commit acf1548
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/generate-templates.yaml b/generate-templates.yaml
@@ -206,7 +206,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
@@ -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: >-