merge from master at 0.7.9-153-g16a7302f

2 files changed, 11 insertions, 2 deletions

diff --git a/cloudinit/sources/helpers/azure.py b/cloudinit/sources/helpers/azure.py
index 6e01aa47..e22409d1 100644
--- a/cloudinit/sources/helpers/azure.py
+++ b/cloudinit/sources/helpers/azure.py
@@ -29,6 +29,14 @@ def cd(newdir):
         os.chdir(prevdir)
 
 
+def _get_dhcp_endpoint_option_name():
+    if util.is_FreeBSD():
+        azure_endpoint = "option-245"
+    else:
+        azure_endpoint = "unknown-245"
+    return azure_endpoint
+
+
 class AzureEndpointHttpClient(object):
 
     headers = {
@@ -235,8 +243,9 @@ class WALinuxAgentShim(object):
         leases = []
         content = util.load_file(fallback_lease_file)
         LOG.debug("content is %s", content)
+        option_name = _get_dhcp_endpoint_option_name()
         for line in content.splitlines():
-            if 'unknown-245' in line:
+            if option_name in line:
                 # Example line from Ubuntu
                 # option unknown-245 a8:3f:81:10;
                 leases.append(line.strip(' ').split(' ', 2)[-1].strip(';\n"'))
diff --git a/cloudinit/sources/helpers/digitalocean.py b/cloudinit/sources/helpers/digitalocean.py
index 257989e8..693f8d5c 100644
--- a/cloudinit/sources/helpers/digitalocean.py
+++ b/cloudinit/sources/helpers/digitalocean.py
@@ -162,7 +162,7 @@ def convert_network_configuration(config, dns_servers):
                 continue
 
             sub_part = _get_subnet_part(raw_subnet)
-            if netdef in ('private', 'anchor_ipv4', 'anchor_ipv6'):
+            if nic_type != "public" or "anchor" in netdef:
                 del sub_part['gateway']
 
             subnets.append(sub_part)