review changes

Author: scrungus

examples/capi-templates-images.yml

@@ -1,6 +1,18 @@
 ###############################################################################
 # Configuration of Glance software images.
 
+# Flavor must have a minimum of 2 VCPUs
+magnum_flavor: "m1.small"
+
+# Network to create tenant cluster FIPs on 
+magnum_external_network: "external"
+
+# Provider for cluster loadbalancers
+magnum_octavia_provider: "amphora"
+
+# helm chart version to use for tenant clusters
+magnum_helm_chart_version: "openstack-cluster-0.1.1-dev.0.main.221"
+
 ubuntu-focal-kube-v1_25_11:
   name: "ubuntu-focal-kube-v1.25.11"
   type: qcow2
@@ -44,57 +56,48 @@ openstack_images:
 # Configuration of Magnum container clusters.
 
 kube-v1_25_11:
-  labels: "kube_tag=v1.25.11"
-  external-network-id: "external"
-  master-flavor: "m1.small"
-  flavor: "m1.small"
+  labels: "monitoring_enabled=false,kube_dashboard_enabled=true,capi_helm_chart_version={{ magnum_helm_chart_version }},octavia_provider={{ magnum_octavia_provider }}"
+  external-network-id: "{{ magnum_external_network }}"
+  master-flavor: "{{ magnum_flavor }}"
+  flavor: "{{ magnum_flavor }}"
   image: "ubuntu-focal-kube-v1.25.11"
-  name: "kube-v1_25_11"
+  name: "kubernetes-v1.25.11"
   coe: "kubernetes"
-  network-driver: "flannel"
-  docker-storage_driver: "overlay2"
-  server-type: "vm"
+  network-driver: "calico"
   master-lb-enabled: True
   floating-ip-enabled: True
+  # If ovn is misconfigured to not have default dns
+  # dns-nameserver: "1.1.1.1,8.8.8.8,8.8.4.4"
+  dns-nameserver: ""
   public: True
-  tls-disabled: False
-  dns-nameserver: "8.8.8.8"
   cluster_distro: "ubuntu"
 
 kube-v1_26_6:
-  labels: "kube_tag=v1.26.6"
-  external-network-id: "external"
-  master-flavor: "m1.small"
-  flavor: "m1.small"
+  labels: "monitoring_enabled=false,kube_dashboard_enabled=true,capi_helm_chart_version={{ magnum_helm_chart_version }},octavia_provider={{ magnum_octavia_provider }}"
+  external-network-id: "{{ magnum_external_network }}"
+  master-flavor: "{{ magnum_flavor }}"
+  flavor: "{{ magnum_flavor }}"
   image: "ubuntu-focal-kube-v1.26.6"
-  name: "kube-v1_26_6"
+  name: "kubernetes-v1.26.6"
   coe: "kubernetes"
-  network-driver: "flannel"
-  docker-storage_driver: "overlay2"
-  server-type: "vm"
+  network-driver: "calico"
   master-lb-enabled: True
   floating-ip-enabled: True
   public: True
-  tls-disabled: False
-  dns-nameserver: "8.8.8.8"
   cluster_distro: "ubuntu"
 
 kube-v1_27_3:
-  labels: "kube_tag=v1.27.3"
-  external-network-id: "external"
-  master-flavor: "m1.small"
-  flavor: "m1.small"
+  labels: "monitoring_enabled=false,kube_dashboard_enabled=true,capi_helm_chart_version={{ magnum_helm_chart_version }},octavia_provider={{ magnum_octavia_provider }}"
+  external-network-id: "{{ magnum_external_network }}"
+  master-flavor: "{{ magnum_flavor }}"
+  flavor: "{{ magnum_flavor}}"
   image: "ubuntu-focal-kube-v1.27.3"
-  name: "kube-v1_27_3"
+  name: "kubernetes-v1.27.3"
   coe: "kubernetes"
-  network-driver: "flannel"
-  docker-storage_driver: "overlay2"
-  server-type: "vm"
+  network-driver: "calico"
   master-lb-enabled: True
   floating-ip-enabled: True
   public: True
-  tls-disabled: False
-  dns-nameserver: "8.8.8.8"
   cluster_distro: "ubuntu"
 
 # List of magnum cluster templates. Format is as required by the