chore: remove routes deletion

Author: assafgi

README.md

@@ -471,7 +471,7 @@ proxy_url = VALUE
 | <a name="input_function_app_storage_account_prefix"></a> [function\_app\_storage\_account\_prefix](#input\_function\_app\_storage\_account\_prefix) | Weka storage account name prefix | `string` | `"weka"` | no |
 | <a name="input_function_app_subnet_delegation_cidr"></a> [function\_app\_subnet\_delegation\_cidr](#input\_function\_app\_subnet\_delegation\_cidr) | Subnet delegation enables you to designate a specific subnet for an Azure PaaS service. | `string` | `"10.0.1.0/25"` | no |
 | <a name="input_function_app_subnet_delegation_id"></a> [function\_app\_subnet\_delegation\_id](#input\_function\_app\_subnet\_delegation\_id) | Required to specify if subnet\_name were used to specify pre-defined subnets for weka. Function subnet delegation requires an additional subnet, and in the case of pre-defined networking this one also should be pre-defined | `string` | `""` | no |
-| <a name="input_function_app_version"></a> [function\_app\_version](#input\_function\_app\_version) | Function app code version (hash) | `string` | `"dfbf0e60f92791206b77092d24711251"` | no |
+| <a name="input_function_app_version"></a> [function\_app\_version](#input\_function\_app\_version) | Function app code version (hash) | `string` | `"817d5d8a75ab065bb20135f95500e0da"` | no |
 | <a name="input_get_weka_io_token"></a> [get\_weka\_io\_token](#input\_get\_weka\_io\_token) | The token to download the Weka release from get.weka.io. | `string` | `""` | no |
 | <a name="input_hotspare"></a> [hotspare](#input\_hotspare) | Number of hotspares to set on weka cluster. Refer to https://docs.weka.io/weka-system-overview/ssd-capacity-management#hot-spare | `number` | `1` | no |
 | <a name="input_install_cluster_dpdk"></a> [install\_cluster\_dpdk](#input\_install\_cluster\_dpdk) | Install weka cluster with DPDK | `bool` | `true` | no |

function-app/code/functions/scale_up/init_script.go

@@ -65,62 +65,6 @@ EOF
 
 netplan apply
 
-if [[ $NICS_NUM -gt 1 ]]; then
-  are_routes_ready='ip route | grep eth1'
-  for(( i=2; i<$NICS_NUM; i++ )); do
-    are_routes_ready=$are_routes_ready' && ip route | grep eth'"$i"
-  done
-cat >>/usr/sbin/remove-routes.sh <<EOF
-#!/bin/bash
-set -ex
-retry_max=24
-for(( i=0; i<\$retry_max; i++ )); do
-  if eval "$are_routes_ready"; then
-    for(( j=1; j<$NICS_NUM; j++ )); do
-      /usr/sbin/ip route del $SUBNET_RANGE dev eth\$j
-    done
-    break
-  fi
-  ip route
-  sleep 5
-done
-if [ \$i -eq \$retry_max ]; then
-  echo "Routes are not ready on time"
-  host_routes=$(ip route)
-  weka_resources=$(weka local resources || "no weka resources")
-  report "{\"hostname\": \"$HOSTNAME\", \"type\": \"error\", \"message\": \"Routes are not ready on time. Routes: $host_routes WEKA resources: $weka_resources\"}"
-  shutdown -h now
-  exit 1
-fi
-echo "Routes were removed successfully"
-EOF
-
-  chmod +x /usr/sbin/remove-routes.sh
-
-cat >/etc/systemd/system/remove-routes.service <<EOF
-[Unit]
-Description=Remove specific routes
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Type=oneshot
-ExecStart=/bin/bash /usr/sbin/remove-routes.sh
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
-  ip route # show routes before removing
-  systemctl daemon-reload
-  systemctl enable remove-routes.service
-  systemctl start remove-routes.service
-  systemctl status remove-routes.service || true # show status of remove-routes.service
-  ip route # show routes after removing
-fi
-
-echo "$(date -u): routes configured"
-
 disk_size_str="${DISK_SIZE}G"
 while ! [ "$(lsblk | grep $disk_size_str | awk '{print $1}')" ] ; do
   echo "waiting for disk to be ready"
@@ -165,11 +109,19 @@ if [ $retry -gt 0 ]; then
   report "{\"hostname\": \"$HOSTNAME\", \"type\": \"debug\", \"message\": \"$msg\"}"
 fi
 
+# debug info
+ip route
+ip addr show
+
 echo "$(date -u): running deploy script"
 
 chmod +x /tmp/deploy.sh
 /tmp/deploy.sh 2>&1 | tee /tmp/weka_deploy.log
 
+# debug info
+ip route
+ip addr show
+
 # Install WEKA maintenance event monitor
 echo "$(date -u): installing weka maintenance event monitor"
 

variables.tf

@@ -410,13 +410,13 @@ variable "function_app_storage_account_container_prefix" {
 variable "function_app_version" {
   type        = string
   description = "Function app code version (hash)"
-  default     = "dfbf0e60f92791206b77092d24711251"
+  default     = "817d5d8a75ab065bb20135f95500e0da"
 }
 
 variable "function_app_dist" {
   type        = string
   description = "Function app code dist"
-  default     = "release"
+  default     = "dev"
 
   validation {
     condition     = contains(["dev", "release"], var.function_app_dist)