Merge branch 'develop' into develop

Author: hgreebe

cookbooks/aws-parallelcluster-environment/files/amazon-2023/network_interfaces/configure_nw_interface.sh

@@ -24,8 +24,8 @@ fi
 
 cd "$configuration_directory"
 
-SUFFIX=$(printf "%03d" $NETWORK_CARD_INDEX)$(printf "%02d" $DEVICE_NUMBER)
-ROUTE_TABLE="$(( $SUFFIX + 10 ))"
+SUFFIX=$NETWORK_CARD_INDEX$(printf "%02d" $DEVICE_NUMBER)
+ROUTE_TABLE="$(( $SUFFIX + 1000 ))"
 
 ln -s /usr/lib/systemd/network/80-ec2.network ${file_name} # Use default EC2 configuration. This include MTU, etc.
 

cookbooks/aws-parallelcluster-environment/files/default/network_interfaces/configure_nw_interface.sh

@@ -21,9 +21,9 @@ then
   exit 1
 fi
 
-SUFFIX=$(printf "%03d" $NETWORK_CARD_INDEX)$(printf "%02d" $DEVICE_NUMBER)
+SUFFIX=$NETWORK_CARD_INDEX$(printf "%02d" $DEVICE_NUMBER)
 
-ROUTE_TABLE="$(( $SUFFIX + 10 ))"
+ROUTE_TABLE="$(( $SUFFIX + 1000 ))"
 
 echo "Configuring device name: ${DEVICE_NAME} with IP:${DEVICE_IP_ADDRESS} CIDR_PREFIX:${CIDR_PREFIX_LENGTH} NETMASK:${NETMASK} GW:${GW_IP_ADDRESS} ROUTING_TABLE:${ROUTE_TABLE}"
 

cookbooks/aws-parallelcluster-environment/files/redhat-8.network_interfaces/configure_nw_interface.sh

@@ -24,8 +24,8 @@ then
 fi
 
 con_name="System ${DEVICE_NAME}"
-SUFFIX=$(printf "%03d" $NETWORK_CARD_INDEX)$(printf "%02d" $DEVICE_NUMBER)
-route_table="$(( $SUFFIX + 10 ))"
+SUFFIX=$NETWORK_CARD_INDEX$(printf "%02d" $DEVICE_NUMBER)
+route_table="$(( $SUFFIX + 1000 ))"
 priority="${route_table}"
 metric="${route_table}"
 

cookbooks/aws-parallelcluster-environment/files/rocky/network_interfaces/configure_nw_interface.sh

@@ -24,8 +24,8 @@ then
 fi
 
 con_name="System ${DEVICE_NAME}"
-SUFFIX=$(printf "%03d" $NETWORK_CARD_INDEX)$(printf "%02d" $DEVICE_NUMBER)
-route_table="$(( $SUFFIX + 10 ))"
+SUFFIX=$NETWORK_CARD_INDEX$(printf "%02d" $DEVICE_NUMBER)
+route_table="$(( $SUFFIX + 1000 ))"
 priority="${route_table}"
 metric="${route_table}"
 

cookbooks/aws-parallelcluster-environment/files/ubuntu/network_interfaces/configure_nw_interface.sh

@@ -41,8 +41,8 @@ if [ "${STATIC_IP_CONFIG}" = "" ]
 fi
 
 FILE="/etc/netplan/${DEVICE_NAME}.yaml"
-SUFFIX=$(printf "%03d" $NETWORK_CARD_INDEX)$(printf "%02d" $DEVICE_NUMBER)
-ROUTE_TABLE="$(( $SUFFIX + 10 ))"
+SUFFIX=$NETWORK_CARD_INDEX$(printf "%02d" $DEVICE_NUMBER)
+ROUTE_TABLE="$(( $SUFFIX + 1000 ))"
 
 echo "Configuring ${DEVICE_NAME} with IP:${DEVICE_IP_ADDRESS} CIDR_PREFIX:${CIDR_PREFIX_LENGTH} NETMASK:${NETMASK} GW:${GW_IP_ADDRESS} ROUTING_TABLE:${ROUTE_TABLE}"