diff mbox series

cloud-init: Remove importing DNS settings

Message ID 20200119163214.26709-1-michael.tremer@ipfire.org
State Accepted
Commit f770492902a5c6194ecd4f596432093498ac6b66
Headers
Series cloud-init: Remove importing DNS settings |

Commit Message

Michael Tremer Jan. 19, 2020, 4:32 p.m. UTC 
  Those scripts used to import settings from the meta-data services
and wrote them to the local configuration files.

For the DNS settings and Amazon, this is no longer possible because
their DNS servers do not support DNSSEC at all. Therefore we default
to recursor mode.

To be consistent across cloud providers, we are doing the same for
Azure.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/initscripts/helper/aws-setup   |  9 ---------
 src/initscripts/helper/azure-setup | 10 ----------
 2 files changed, 19 deletions(-)
diff mbox series

Patch

diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup
index af6d24c8b..cee78a283 100644
--- a/src/initscripts/helper/aws-setup
+++ b/src/initscripts/helper/aws-setup
@@ -115,9 +115,6 @@  import_aws_configuration() {
 		fi
 	fi
 
-	# Import any DNS server settings
-	eval $(/usr/local/bin/readhash <(grep -E "^DNS([0-9])=" /var/ipfire/ethernet/settings 2>/dev/null))
-
 	# Import network configuration
 	# After this, no network connectivity will be available from this script due to the
 	# renaming of the network interfaces for which they have to be shut down
@@ -161,10 +158,6 @@  import_aws_configuration() {
 				# The gateway is always the first IP address in the subnet
 				local gateway="$(to_address $(( netaddress_num + 1 )))"
 
-				# The AWS internal DNS service is available on the second IP address of the VPC
-				local dns1="$(to_address $(( vpc_netaddress_num + 2 )))"
-				local dns2=
-
 				(
 					echo "RED_TYPE=STATIC"
 					echo "RED_DEV=${interface_name}"
@@ -175,8 +168,6 @@  import_aws_configuration() {
 					echo "RED_NETADDRESS=${netaddress}"
 					echo "RED_BROADCAST=${broadcast}"
 					echo "DEFAULT_GATEWAY=${gateway}"
-					echo "DNS1=${DNS1:-${dns1}}"
-					echo "DNS2=${DNS2:-${dns2}}"
 				) >> /var/ipfire/ethernet/settings
 
 				# Import aliases for RED
diff --git a/src/initscripts/helper/azure-setup b/src/initscripts/helper/azure-setup
index 86042a204..d497c43b2 100644
--- a/src/initscripts/helper/azure-setup
+++ b/src/initscripts/helper/azure-setup
@@ -138,9 +138,6 @@  import_azure_configuration() {
 		fi
 	fi
 
-	# Import any DNS server settings
-	eval $(/usr/local/bin/readhash <(grep -E "^DNS([0-9])=" /var/ipfire/ethernet/settings 2>/dev/null))
-
 	# Import network configuration
 	# After this, no network connectivity will be available from this script due to the
 	# renaming of the network interfaces for which they have to be shut down
@@ -175,11 +172,6 @@  import_azure_configuration() {
 				# The gateway is always the first IP address in the subnet
 				local gateway="$(to_address $(( netaddress_num + 1 )))"
 
-				# Microsoft uses a special IP address for DNS
-				# https://blogs.msdn.microsoft.com/mast/2015/05/18/what-is-the-ip-address-168-63-129-16/
-				local dns1="168.63.129.16"
-				local dns2=
-
 				(
 					echo "RED_TYPE=STATIC"
 					echo "RED_DEV=${interface_name}"
@@ -190,8 +182,6 @@  import_azure_configuration() {
 					echo "RED_NETADDRESS=${netaddress}"
 					echo "RED_BROADCAST=${broadcast}"
 					echo "DEFAULT_GATEWAY=${gateway}"
-					echo "DNS1=${DNS1:-${dns1}}"
-					echo "DNS2=${DNS2:-${dns2}}"
 				) >> /var/ipfire/ethernet/settings
 
 				# Import aliases for RED