diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py index 1b49ad16525..879eb66de63 100644 --- a/cloudinit/sources/DataSourceEc2.py +++ b/cloudinit/sources/DataSourceEc2.py @@ -1066,8 +1066,6 @@ def convert_ec2_metadata_network_config( "set-name": nic_name, } nic_metadata = macs_metadata.get(mac) - if nic_metadata.get("ipv6s"): # Any IPv6 addresses configured - dev_config["dhcp6"] = True netcfg["ethernets"][nic_name] = dev_config return netcfg # Apply network config for all nics and any secondary IPv4/v6 addresses @@ -1114,8 +1112,6 @@ def convert_ec2_metadata_network_config( table=table, ) if nic_metadata.get("ipv6s"): # Any IPv6 addresses configured - dev_config["dhcp6"] = True - dev_config["dhcp6-overrides"] = dhcp_override if ( is_netplan and nic_metadata.get("device-number") diff --git a/tests/unittests/sources/test_ec2.py b/tests/unittests/sources/test_ec2.py index e6e1aec9277..7ba4f881083 100644 --- a/tests/unittests/sources/test_ec2.py +++ b/tests/unittests/sources/test_ec2.py @@ -460,7 +460,7 @@ def test_network_config_property_returns_version_2_network_data(self): "match": {"macaddress": "06:17:04:d7:26:09"}, "set-name": "eth9", "dhcp4": True, - "dhcp6": True, + "dhcp6": False, } }, } @@ -545,7 +545,7 @@ def test_network_config_property_secondary_private_ips(self): "2600:1f16:292:100:f153:12a3:c37c:11f9/128", ], "dhcp4": True, - "dhcp6": True, + "dhcp6": False, } }, } @@ -625,7 +625,7 @@ def test_network_config_cached_property_refreshed_on_upgrade(self, m_dhcp): "match": {"macaddress": mac1}, "set-name": "eth9", "dhcp4": True, - "dhcp6": True, + "dhcp6": False, } }, } @@ -1154,7 +1154,7 @@ def test_convert_ec2_metadata_network_config_handles_only_dhcp6(self): "match": {"macaddress": self.mac1}, "set-name": "eth9", "dhcp4": True, - "dhcp6": True, + "dhcp6": False, } }, } @@ -1234,7 +1234,7 @@ def test_convert_ec2_metadata_network_config_handles_local_v4_and_v6(self): "match": {"macaddress": self.mac1}, "set-name": "eth9", "dhcp4": True, - "dhcp6": True, + "dhcp6": False, } }, } @@ -1267,8 +1267,7 @@ def test_convert_ec2_metadata_network_config_multi_nics_ipv4(self): "set-name": "eth9", "dhcp4": True, "dhcp4-overrides": {"route-metric": 100}, - "dhcp6": True, - "dhcp6-overrides": {"route-metric": 100}, + "dhcp6": False, }, "eth10": { "match": {"macaddress": mac2}, @@ -1327,10 +1326,9 @@ def test_convert_ec2_metadata_network_config_multi_nics_ipv4_ipv6_multi_ip( "eth9": { "dhcp4": True, "dhcp4-overrides": {"route-metric": 100}, - "dhcp6": True, + "dhcp6": False, "match": {"macaddress": "06:17:04:d7:26:09"}, "set-name": "eth9", - "dhcp6-overrides": {"route-metric": 100}, }, "eth10": { "dhcp4": True, @@ -1338,7 +1336,7 @@ def test_convert_ec2_metadata_network_config_multi_nics_ipv4_ipv6_multi_ip( "route-metric": 200, "use-routes": True, }, - "dhcp6": True, + "dhcp6": False, "match": {"macaddress": "06:17:04:d7:26:08"}, "set-name": "eth10", "routes": [ @@ -1361,10 +1359,6 @@ def test_convert_ec2_metadata_network_config_multi_nics_ipv4_ipv6_multi_ip( "table": 101, }, ], - "dhcp6-overrides": { - "route-metric": 200, - "use-routes": True, - }, "addresses": ["2600:1f16:292:100:f153:12a3:c37c:11f9/128"], }, }, @@ -1394,7 +1388,7 @@ def test_convert_ec2_metadata_network_config_handles_dhcp4_and_dhcp6(self): "match": {"macaddress": self.mac1}, "set-name": "eth9", "dhcp4": True, - "dhcp6": True, + "dhcp6": False, } }, }