update azhop marketplace

marketplace/solution/azhop/marketplace_config.yml

@@ -60,11 +60,11 @@ network:
       frontend: 
         name: frontend
         address_prefixes: "[concat(_X1_, '.', _X2_, '.', _X3_, '.0/29')]"
-        create: true # create the subnet if true. default to true when not specified, default to false if using an existing VNET when not specified
-      ad:
-        name: ad
+        create: true # create the subnet if true. default to true when not specified, default to false if using an existing VNET when not specifiede
+      database: 
+        name: database
         address_prefixes: "[concat(_X1_, '.', _X2_, '.', _X3_, '.8/29')]"
-        create: true
+        create: "[if(equals(steps('scheduler').scheduler, 'slurm'), steps('scheduler').slurmAccounting, false)]" 
       admin:
         name: admin
         address_prefixes: "[concat(_X1_, '.', _X2_, '.', _X3_, '.16/28')]"
@@ -92,14 +92,16 @@ locked_down_network:
   enforce: false
   public_ip: "[steps('network').publicIp]" # Enable public IP creation for Jumpbox, OnDemand and create images. Default to true
 
+# NAT Gateway is used for outbound internet connectivity
+nat_gateway:
+  create: "[steps('network').natgateway]"
+
 linux_base_image: almalinux:almalinux-x86_64:8_7-gen2:latest # publisher:offer:sku:version or image_id
 windows_base_image: "MicrosoftWindowsServer:WindowsServer:2019-Datacenter-smalldisk:latest" # publisher:offer:sku:version or image_id
 
 deployer:
   vm_size: Standard_B2ms
   ssh_port: 8822
-ad:
-  vm_size: Standard_B2ms
 ondemand:
   vm_size: Standard_D8s_v5
   generate_certificate: true

marketplace/solution/azhop/ui_definition.json

@@ -271,6 +271,13 @@
             "toolTip": "This is required for public access.",
             "defaultValue": true
           },
+          {
+            "name": "natgateway",
+            "type": "Microsoft.Common.CheckBox",
+            "label": "Create a NAT Gateway",
+            "toolTip": "Deploy a NAT Gateway for outbound internet connections",
+            "defaultValue": false
+          },
           {
             "name": "peering",
             "type": "Microsoft.Common.CheckBox",

toolset/scripts/azhop-dependencies.yml

@@ -37,6 +37,8 @@
       apt:
         name: "{{ item }}"
         state: present
+        update_cache: yes
+        cache_valid_time: 3600
       with_items:
         - apt-utils
         - curl