F #277 Fix onegate proxy static route for real

OpenNebula · May 11, 2023 · 0288d75 · 0288d75
1 parent 1c08a2f
commit 0288d75
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 15 deletions.
diff --git a/src/etc/one-context.d/loc-10-network.d/functions b/src/etc/one-context.d/loc-10-network.d/functions
@@ -55,7 +55,7 @@ initialize_network()
     [ "${action}" = 'configure' ] || return 0
 
     export onegate_proxy_route_missing="yes" # flag route not setup
-    
+
     _context_interfaces=$(get_context_interfaces)
     _iface_mac=$(get_interface_mac)
 
@@ -595,16 +595,15 @@ is_link_local() {
 }
 
 get_onegate_ip() {
- if [[ -n $ONEGATE_ENDPOINT ]]; then
-	# Regular expression to match an IPv4 address
-	ipv4_regex="([0-9]{1,3}\.){3}[0-9]{1,3}"
-
-	export onegate_host=$(echo "$ONEGATE_ENDPOINT" | grep -oE "$ipv4_regex")
+	if [[ -n $ONEGATE_ENDPOINT ]]; then
+		#Regular expression to match an IPv4 address
+		ipv4_regex="([0-9]{1,3}\.){3}[0-9]{1,3}"
 
-	echo "$onegate_host"
- fi
+		export onegate_host
+		onegate_host=$(echo "$ONEGATE_ENDPOINT" | grep -oE "$ipv4_regex")
+	fi
 }
 
 add_onegate_proxy_route?() {
-    is_link_local "$(get_onegate_ip)" && [[ $onegate_proxy_route_missing == "yes" ]]
+    is_link_local "$onegate_host" && [[ $onegate_proxy_route_missing == "yes" ]]
 }
diff --git a/src/etc/one-context.d/loc-10-network.d/netcfg-bsd b/src/etc/one-context.d/loc-10-network.d/netcfg-bsd
@@ -163,7 +163,8 @@ gen_iface_conf()
     fi
 
     # Add ONEGATE Proxy static route
-    if [[ $(add_onegate_proxy_route?) ]]; then
+    get_onegate_ip
+    if add_onegate_proxy_route?; then
         route_name="r_onegateproxy"
 
         sed -i "s/${route_names}/${route_names} ${route_name}/g" "$routes_conf_path"

diff --git a/src/etc/one-context.d/loc-10-network.d/netcfg-interfaces b/src/etc/one-context.d/loc-10-network.d/netcfg-interfaces
@@ -175,7 +175,8 @@ EOT
     fi
 
     # Add ONEGATE Proxy static route
-    if [[ $(add_onegate_proxy_route?) ]]; then
+    get_onegate_ip
+    if add_onegate_proxy_route?; then
         echo "  up ip route replace ${onegate_host} dev ${dev}"
 
         # Will make proxy static route only applicable to 1st interface

diff --git a/src/etc/one-context.d/loc-10-network.d/netcfg-netplan b/src/etc/one-context.d/loc-10-network.d/netcfg-netplan
@@ -167,7 +167,8 @@ EOT
         fi
 
     # Add ONEGATE Proxy static route
-    if [[ $(add_onegate_proxy_route?) ]]; then
+    get_onegate_ip
+    if add_onegate_proxy_route?; then
         # ip route replace 169.254.16.9/32 via eth0
         cat <<EOT
         - to: "${onegate_host}"

diff --git a/src/etc/one-context.d/loc-10-network.d/netcfg-networkd b/src/etc/one-context.d/loc-10-network.d/netcfg-networkd
@@ -137,7 +137,8 @@ EOT
     fi
 
     # Add ONEGATE Proxy static route
-    if [[ $(add_onegate_proxy_route?) ]]; then
+    get_onegate_ip
+    if add_onegate_proxy_route?; then
         # ip route replace 169.254.16.9/32 via eth0
         echo "[Route]"
         echo "Destination=${onegate_host}"

diff --git a/src/etc/one-context.d/loc-10-network.d/netcfg-nm b/src/etc/one-context.d/loc-10-network.d/netcfg-nm
@@ -140,7 +140,8 @@ gen_iface_conf()
     fi
 
     # Add ONEGATE Proxy static route
-    if [[ $(add_onegate_proxy_route?) ]]; then
+    get_onegate_ip
+    if add_onegate_proxy_route?; then
         # ip route replace 169.254.16.9/32 via eth0
         nmcli con mod "$dev" +ipv4.routes "$onegate_host"
 

diff --git a/src/etc/one-context.d/loc-10-network.d/netcfg-scripts b/src/etc/one-context.d/loc-10-network.d/netcfg-scripts
@@ -141,7 +141,8 @@ EOT
     fi
 
     # Add ONEGATE Proxy static route
-    if [[ $(add_onegate_proxy_route?) ]]; then
+    get_onegate_ip
+    if add_onegate_proxy_route?; then
         route="${onegate_host} dev ${dev}"
         echo "$route" >> "${config_path}/route-${dev}"