bump tkgm and fix alb bugs

deploy.yml

@@ -94,13 +94,13 @@
     # NSX-ALB (Avi) Section
     - role: nsx-alb/deploy-controller
       when: 'nsx_alb is defined'
-      tags: ["nsx-alb"]
+      tags: ["nsx-alb", "alb-controller"]
     - role: nsx-alb/configure-cloud
       when: 'nsx_alb is defined'
       tags: ["nsx-alb", "alb-cloud"]
     - role: nsx-alb/dummy-service
       when: 'nsx_alb.dummy_service is defined'
-      tags: ["nsx-alb"]
+      tags: ["nsx-alb", "alb-dummy"]
 
     # Tanzu Multi-Cloud Secton
     - role: tanzu/multi-cloud-generate-config

roles/nsx-alb/configure-cloud/tasks/main.yml

@@ -10,7 +10,7 @@
     prefer_static_routes: false
     vcenter_configuration:
       datacenter: "{{ cloud_vcenter_datacenter }}"
-      management_network: /api/vimgrnwruntime/?name={{ se_management_port_group }}
+      management_network: "{{ se_management_port_group }}"
       password: "{{ cloud_vcenter_password }}"
       privilege: WRITE_ACCESS
       username: "{{ cloud_vcenter_username }}"
@@ -79,6 +79,7 @@
     avi_credentials: "{{ avi_credentials }}"
     name: "{{ se_management_port_group }}"
     dhcp_enabled: false
+    cloud_ref: "/api/cloud?name=Default-Cloud"
     configured_subnets:
       - prefix:
           ip_addr:
@@ -100,7 +101,7 @@
     avi_credentials: "{{ avi_credentials }}"
     internal_profile:
       usable_networks:
-        - nw_ref: /api/network/?name={{ se_vip_port_group }}
+        - nw_ref: "{{ se_vip_port_group }}"
       ttl: 30
     name: tkg-ipam-profile
     type: IPAMDNS_TYPE_INTERNAL
@@ -165,7 +166,9 @@
   vmware.alb.avi_network:
     avi_credentials: "{{ avi_credentials }}"
     name: "{{ se_vip_port_group }}"
+    cloud_ref: "/api/cloud?name=Default-Cloud"
     dhcp_enabled: false
+    exclude_discovered_subnets: true
     configured_subnets:
       - prefix:
           ip_addr:
@@ -180,4 +183,5 @@
               end:
                 addr: "{{ se_vip_network_range.split('-')[1] }}"
                 type: "V4"
+            type: "STATIC_IPS_FOR_VIP_AND_SE"
   register: vip_network_result

var-examples/tanzu/multi-cloud/README.md

@@ -2,8 +2,8 @@
 This will deploy using the standard 2 network topology
 
 ## Tested Versions
-- NSX ALB Controller 20.1.7
-- Tanzu Kubernetes Grid 1.6.0
+- NSX ALB Controller 22.1.4
+- Tanzu Kubernetes Grid 2.4.0
 
 ## Additional Dependencies
 In addition to the base dependencies, you will need to download and store the NSX-ALB OVA file in your software directory:

var-examples/tanzu/multi-cloud/opinionated-1host.yml

@@ -1,9 +1,9 @@
 ---
 # SOFTWARE_DIR must contain all required software
-vc_iso: "{{ lookup('env', 'SOFTWARE_DIR') }}/VMware-VCSA-all-8.0.1-21860503.iso"
+vc_iso: "{{ lookup('env', 'SOFTWARE_DIR') }}/VMware-VCSA-all-8.0.1-22088981.iso"
 esxi_ova: "{{ lookup('env', 'SOFTWARE_DIR') }}/Nested_ESXi8.0u1a_Appliance_Template_v1.ova"
-nsx_alb_controller_ova: "{{ lookup('env', 'SOFTWARE_DIR') }}/controller-21.1.5-9172.ova"
-tkgm_os_kubernetes_ova: "{{ lookup('env', 'SOFTWARE_DIR') }}/ubuntu-2004-kube-v1.26.5+vmware.2-tkg.1-814430d158ce7889d5a7b60efeda67ca.ova"
+nsx_alb_controller_ova: "{{ lookup('env', 'SOFTWARE_DIR') }}/controller-22.1.4-9196.ova"
+tkgm_os_kubernetes_ova: "{{ lookup('env', 'SOFTWARE_DIR') }}/ubuntu-2004-kube-v1.27.5+vmware.1-tkg.1-0eb96d2f9f4f705ac87c40633d4b69st.ova"
 
 environment_tag: "tanzu-multi-cloud-avi"  # Used to prepend object names in hosting vCenter
 dns_server: "192.168.0.1"
@@ -24,8 +24,8 @@ opinionated:
   master_password: "VMware1!"
   number_of_hosts: 1  # number of ESXi VMs to deploy
   nested_hosts:
-    cpu_cores: 16  # CPU count per nested host
-    ram_in_gb: 128  # memory per nested host
+    cpu_cores: 24  # CPU count per nested host
+    ram_in_gb: 192  # memory per nested host
     local_disks:  # (optional) this section can be removed to not modify local disks
       - size_gb: 500
         datastore_prefix: "datastore"  # omit this to not have a datastore created
@@ -160,7 +160,7 @@ tanzu_multi_cloud:
   vsphere_username: "{{ nested_vcenter.username }}"
 
 nsx_alb:
-  api_version: "20.1.6"
+  api_version: "22.1.4"
   controller_username: admin
   controller_password: "{{ opinionated.master_password }}"
   controller_ssh_public_key: "{{ opinionated.ssh_public_key }}"