Test ansible output regression workaround #2;Refactor vapp properties;Add kube-vip dependency;Refactor netplan;Download/Trust root CA

scripts/Update-OvfConfiguration.bootstrap.yml

@@ -15,7 +15,7 @@ DynamicDisks:
   Constraints:
     Minimum: 100
     Maximum: ''
-  PropertyCategory: 1
+  PropertyCategory: 2
 
 PropertyCategories:
 
@@ -31,6 +31,22 @@ PropertyCategories:
 - Name: 1) Meta-cluster
   ProductProperties:
 
+  - Key: metacluster.fqdn
+    Type: string(1..)
+    Label: Meta-cluster FQDN*
+    Description: Respective subdomains will be available for each component (e.g. storage.example.org); this address should already be configured as a wildcard record within your DNS zone.
+    DefaultValue: meta.k8s.cluster
+    Configurations: '*'
+    UserConfigurable: true
+
+  - key: metacluster.vip
+    Type: ip
+    Label: Meta-cluster virtual IP*
+    Description: Meta-cluster control plane endpoint virtual IP
+    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+
   - key: metacluster.token
     Type: string(1..)
     Label: K3s install token*
@@ -39,6 +55,9 @@ PropertyCategories:
     Configurations: '*'
     UserConfigurable: true
 
+- Name: 2) Meta-cluster initial node
+  ProductProperties:
+
   - Key: guestinfo.hostname
     Type: string(1..15)
     Label: Hostname*
@@ -71,14 +90,6 @@ PropertyCategories:
     Configurations: '*'
     UserConfigurable: true
 
-  - Key: metacluster.fqdn
-    Type: string(1..)
-    Label: Appliance FQDN*
-    Description: Respective subdomains will be available for each component (e.g. storage.example.org); this address should already be configured as a wildcard record within your DNS zone.
-    DefaultValue: meta.k8s.cluster
-    Configurations: '*'
-    UserConfigurable: true
-
   - Key: guestinfo.dnsserver
     Type: ip
     Label: DNS server*
@@ -103,7 +114,7 @@ PropertyCategories:
     Configurations: '*'
     UserConfigurable: true
 
-- Name: 2) Workload-cluster
+- Name: 3) Workload-cluster
   ProductProperties:
 
   - Key: workloadcluster.name
@@ -138,7 +149,7 @@ PropertyCategories:
     Configurations: '*'
     UserConfigurable: true
 
-- Name: 3) Common
+- Name: 4) Common
   ProductProperties:
 
   - Key: guestinfo.rootsshkey
@@ -149,7 +160,7 @@ PropertyCategories:
     Configurations: '*'
     UserConfigurable: true
 
-- Name: 4) Hypervisor
+- Name: 5) Hypervisor
   ProductProperties:
 
   - Key: hv.fqdn

scripts/Update-OvfConfiguration.upgrade.yml

@@ -1,13 +1,3 @@
-DeploymentConfigurations:
-
-- Id: cp1w1
-  Label: 'Workload-cluster: 1 control-plane node/1 worker node'
-  Description: 1 control-plane node/1 worker node
-
-- Id: cp1w2
-  Label: 'Workload-cluster: 1 control-plane node/2 worker nodes'
-  Description: 1 control-plane node/2 worker nodes
-
 DynamicDisks:
 
 - Description: Longhorn persistent storage
@@ -19,16 +9,26 @@ DynamicDisks:
 
 PropertyCategories:
 
-- Name: 0) Deployment information
+- Name: 1) Existing meta-cluster
   ProductProperties:
-  - Key: deployment.type
-    Type: string
-    Value:
-    - cp1w1
-    - cp1w2
-    UserConfigurable: false
 
-- Name: 1) Meta-cluster
+  - Key: metacluster.vip
+    Type: string(1..)
+    Label: Meta-cluster FQDN/IP-address*
+    Description: The address of the target meta-cluster which this appliance will perform an upgrade on.
+    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+
+  - key: metacluster.token
+    Type: string(1..)
+    Label: K3s install token*
+    Description: Must match the token originally used for the target meta-cluster
+    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+
+- Name: 2) Add meta-cluster node
   ProductProperties:
 
   - Key: guestinfo.hostname
@@ -63,22 +63,6 @@ PropertyCategories:
     Configurations: '*'
     UserConfigurable: true
 
-  - Key: metacluster.fqdn
-    Type: string(1..)
-    Label: Meta-cluster FQDN/IP-address*
-    Description: The address of the target meta-cluster which this appliance will perform an upgrade on.
-    DefaultValue: ''
-    Configurations: '*'
-    UserConfigurable: true
-
-  - key: metacluster.token
-    Type: string(1..)
-    Label: K3s install token*
-    Description: Must match the token originally used for the target meta-cluster
-    DefaultValue: ''
-    Configurations: '*'
-    UserConfigurable: true
-
   - Key: guestinfo.dnsserver
     Type: ip
     Label: DNS server*
@@ -103,7 +87,7 @@ PropertyCategories:
     Configurations: '*'
     UserConfigurable: true
 
-- Name: 2) Common
+- Name: 3) Common
   ProductProperties:
 
   - Key: guestinfo.rootsshkey
@@ -114,7 +98,7 @@ PropertyCategories:
     Configurations: '*'
     UserConfigurable: true
 
-- Name: 3) Hypervisor
+- Name: 4) Hypervisor
   ProductProperties:
 
   - Key: hv.fqdn