.azvm-deploy-pipfix

linuxconf/files/mymsbin/azvm-deploy.sh

@@ -143,14 +143,15 @@ plugin_hook plugin_before_vm_creat
 
 # Actually create the VM
 for cter in $(seq $vmcount); do
-    debugexec az vm create -g "$resgrp" --name "$vmname$cter" --image "$vmimg" --admin-password "$vm_admin_pass" --admin-username r --location "$location" --size "$vmsize" --vnet-name "$vnetname" --subnet default "${vm_create_xtra_arg[@]}" "${vm_create_xtra_arg_first_n[@]}" || exit $?
+    vm_create_xtra_arg_i=("${vm_create_xtra_arg[@]}")
+    [ "$cter" -le "$only_n_vms_in_tip" ] && vm_create_xtra_arg_i+=("${vm_create_xtra_arg_first_n[@]}")
+
+    plugin_hook plugin_before_each_vm_creat
+    debugexec az vm create -g "$resgrp" --name "$vmname$cter" --image "$vmimg" --admin-password "$vm_admin_pass" --admin-username r --location "$location" --size "$vmsize" --vnet-name "$vnetname" --subnet default "${vm_create_xtra_arg_i[@]}" || exit $?
 
     if [ "$vnet_ipv6" = 1 ]; then
         debugexec az network nic ip-config create -g "$resgrp" --name "$vmname${cter}-xtraipc" --nic-name "$vmname${cter}VMNic" --private-ip-address-version IPv6 --vnet-name "$vnetname" --subnet default
     fi
-
-    # Clear these args for only 1st VM
-    [ "$cter" -ge "$only_n_vms_in_tip" ] && vm_create_xtra_arg_first_n=()
     plugin_hook plugin_after_each_vm_creat
 done
 

linuxconf/files/mymsbin/azvm-plugins/extra-tip

@@ -27,7 +27,7 @@ function plugin_before_vm_creat () {
     debugexec az deployment group create -g "$resgrp" --template-file /tmp/template-avset.json --parameters "avname=tip2_$avname" "location=$location" "tipid=$tip2_id" "cluster=$tip2_cluster" || exit $?
 }
 
-function plugin_after_each_vm_creat () {
-    [ "$cter" -ge "$only_n_vms_in_tip" ] && vm_create_xtra_arg_first_n+=(--availability-set "tip2_$avname")
+function plugin_before_each_vm_creat () {
+    [ "$cter" -gt "$only_n_vms_in_tip" ] && vm_create_xtra_arg_i+=(--availability-set "tip2_$avname")
 }
 

linuxconf/files/mymsbin/azvm-plugins/secured

@@ -9,9 +9,10 @@ This plugin makes your VM compliant by:
   1. Use TLS-compliant OS img.
   2. Disable vnet outbound default access. (You need azcli older than 2.73.0)
   3. Install Azure Monitor.
+  4. Set a tag for public ip.
 
 Extra Optional Args:
-  secured_version (default = 2505)
+  secured_version (default = 2506)
 "
 }
 
@@ -52,7 +53,7 @@ function vnet_args_parse_helper() {
 }
 
 function plugin_before_vnet_creat () {
-    var_default_val secured_version 2505
+    var_default_val secured_version 2506
 
     if [ "$secured_version" -ge 2504 ]; then
         # Block default-outbound-access.
@@ -79,6 +80,13 @@ function plugin_before_vm_creat () {
     fi
 }
 
+function plugin_before_each_vm_creat () {
+    az network public-ip create -g "$resgrp" -n "pip$prefix$cter" --location "$location" --ip-tags "FirstPartyUsage=/____"
+    vm_create_xtra_arg_i+=(--public-ip-address "pip$prefix$cter")
+}
+
+
+
 function plugin_after_each_vm_creat () {
     if [ "$secured_version" -ge 2505 ]; then
         debugexec az vm extension set -n AzureMonitorLinuxAgent  --publisher Microsoft.Azure.Monitor             --version 1.0 --vm-name "$vmname$cter" --resource-group "$resgrp" --enable-auto-upgrade true --settings '{"GCS_AUTO_CONFIG":true}'
@@ -86,5 +94,3 @@ function plugin_after_each_vm_creat () {
     fi
 }
 
-
-