diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py
index 26f3168d..4adf7d45 100644
--- a/cloudinit/sources/helpers/openstack.py
+++ b/cloudinit/sources/helpers/openstack.py
@@ -583,6 +583,14 @@ def convert_net_json(network_json=None, known_macs=None):
                 subnet['ipv4'] = True
             if network['type'] == 'ipv6':
                 subnet['ipv6'] = True
+
+            for service in network.get('services', []):
+                if service.get('type') != 'dns':
+                    continue
+                if 'dns_nameservers' not in subnet:
+                    subnet['dns_nameservers'] = []
+                subnet['dns_nameservers'].append(service['address'])
+
             subnets.append(subnet)
         cfg.update({'subnets': subnets})
         if link['type'] in PHYSICAL_TYPES:
@@ -659,9 +667,10 @@ def convert_net_json(network_json=None, known_macs=None):
                 cfg[key] = fmt % link_id_info[target]['name']
 
     for service in services:
-        cfg = service
-        cfg.update({'type': 'nameserver'})
-        config.append(cfg)
+        if service.get('type') != 'dns':
+            continue
+        config.append(
+            {'type': 'nameserver', 'address': service.get('address')})
 
     return {'version': 1, 'config': config}
 
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index e49abcc4..5d319956 100644
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -18,11 +18,11 @@ from .helpers import populate_dir
 
 import base64
 import copy
+from textwrap import dedent
 import gzip
 import io
 import json
 import os
-import textwrap
 import yaml
 
 DHCP_CONTENT_1 = """
@@ -324,6 +324,86 @@ dns = none
             ('etc/udev/rules.d/70-persistent-net.rules',
              "".join(['SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ',
                       'ATTR{address}=="fa:16:3e:ed:9a:59", NAME="eth0"\n']))]
+    },
+    {
+        'in_data': {
+            "services": [{"type": "dns", "address": "8.8.8.8"}],
+            "networks": [{
+                "network_id": "public-ipv4",
+                "type": "ipv4", "netmask": "255.255.252.0",
+                "link": "tap00000000-79",
+                "routes": [{
+                    "netmask": "0.0.0.0",
+                    "network": "0.0.0.0",
+                    "gateway": "172.19.3.254",
+                }],
+                "ip_address": "172.19.1.34", "id": "network0",
+                "services": [{"type": "dns", "address": "8.8.8.8"}],
+            }, {
+                "network_id": "public-ipv6-a",
+                "type": "ipv6", "netmask": "",
+                "link": "tap00000000-79",
+                "routes": [
+                    {
+                        "gateway": "2001:DB8::1",
+                        "netmask": "::",
+                        "network": "::"
+                    }
+                ],
+                "ip_address": "2001:DB8::10", "id": "network1",
+                "services": [{"type": "dns", "address": "2001:DB8::2"}],
+            }, {
+                "network_id": "private-ipv4-a",
+                "type": "ipv4", "netmask": "255.255.255.0",
+                "link": "tap00000000-80",
+                "routes": [
+                ],
+                "ip_address": "192.168.2.2", "id": "network2",
+                "services": [{"type": "dns", "address": "192.168.2.1"}],
+            }, {
+                "network_id": "public-ipv4-b",
+                "type": "ipv4", "netmask": "64",
+                "link": "tap1a81968a-80",
+                "routes": [
+                ],
+                "ip_address": "192.168.1.2", "id": "network3",
+            }],
+            "links": [
+                {
+                    "ethernet_mac_address": "fa:16:3e:ed:9a:79",
+                    "mtu": None, "type": "phy", "id":
+                    "tap00000000-79",
+                    "vif_id": "1a81968a-797a-400f-8a80-000000000079"
+                },
+                {
+                    "ethernet_mac_address": "fa:16:3e:ed:9a:80",
+                    "mtu": None, "type": "phy", "id":
+                    "tap00000000-80",
+                    "vif_id": "1a81968a-797a-400f-8a80-000000000080"
+                },
+            ],
+        },
+        'in_macs': {
+            'fa:16:3e:ed:9a:79': 'eth0',
+            'fa:16:3e:ed:9a:80': 'eth1',
+        },
+        'out_sysconfig': [
+            ('etc/sysconfig/network-scripts/ifcfg-eth0', dedent("""\
+                 FIXME: NOT SURE network-scripts/ifcfg-eth0""" + "\n")),
+            ('etc/sysconfig/network-scripts/ifcfg-eth1', dedent("""\
+                 FIXME: NOT SURE network-scripts/ifcfg-eth1""" + "\n")),
+            ('etc/resolv.conf', dedent("""\
+                 FIXME: NOT SURE etc/resolv.conf""" + "\n")),
+            ('etc/NetworkManager/conf.d/99-cloud-init.conf', dedent("""\
+                 FIXME: NOT SURE conf.d/99-cloud-init.conf""" + "\n")),
+            ('etc/udev/rules.d/70-persistent-net.rules',
+             "\n".join([
+                 ('SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", '
+                  'ATTR{address}=="fa:16:3e:ed:9a:79", NAME="eth0"'),
+                 ('SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", '
+                  'ATTR{address}=="fa:16:3e:ed:9a:80", NAME="eth1"'),
+                 ""])),
+       ],
     }
 ]
 
@@ -368,7 +448,7 @@ iface eth1 inet static
 
 NETWORK_CONFIGS = {
     'small': {
-        'expected_eni': textwrap.dedent("""\
+        'expected_eni': dedent("""\
             auto lo
             iface lo inet loopback
                 dns-nameservers 1.2.3.4 5.6.7.8
@@ -387,7 +467,7 @@ NETWORK_CONFIGS = {
                 post-up route add default gw 65.61.151.37 || true
                 pre-down route del default gw 65.61.151.37 || true
         """).rstrip(' '),
-        'expected_netplan': textwrap.dedent("""
+        'expected_netplan': dedent("""
             network:
                 version: 2
                 ethernets:
@@ -423,15 +503,16 @@ NETWORK_CONFIGS = {
                         set-name: eth99
         """).rstrip(' '),
         'expected_sysconfig': {
-            'ifcfg-eth1': textwrap.dedent("""\
+            'ifcfg-eth1': dedent("""\
                 BOOTPROTO=none
                 DEVICE=eth1
+                XXX=bar
                 HWADDR=cf:d6:af:48:e8:80
                 NM_CONTROLLED=no
                 ONBOOT=yes
                 TYPE=Ethernet
                 USERCTL=no"""),
-            'ifcfg-eth99': textwrap.dedent("""\
+            'ifcfg-eth99': dedent("""\
                 BOOTPROTO=dhcp
                 DEFROUTE=yes
                 DEVICE=eth99
@@ -444,7 +525,7 @@ NETWORK_CONFIGS = {
                 TYPE=Ethernet
                 USERCTL=no"""),
         },
-        'yaml': textwrap.dedent("""
+        'yaml': dedent("""
             version: 1
             config:
                 # Physical interfaces.
@@ -476,7 +557,7 @@ NETWORK_CONFIGS = {
         """),
     },
     'v4_and_v6': {
-        'expected_eni': textwrap.dedent("""\
+        'expected_eni': dedent("""\
             auto lo
             iface lo inet loopback
 
@@ -486,7 +567,7 @@ NETWORK_CONFIGS = {
             # control-alias iface0
             iface iface0 inet6 dhcp
         """).rstrip(' '),
-        'expected_netplan': textwrap.dedent("""
+        'expected_netplan': dedent("""
             network:
                 version: 2
                 ethernets:
@@ -494,7 +575,7 @@ NETWORK_CONFIGS = {
                         dhcp4: true
                         dhcp6: true
         """).rstrip(' '),
-        'yaml': textwrap.dedent("""\
+        'yaml': dedent("""\
             version: 1
             config:
               - type: 'physical'
@@ -505,7 +586,7 @@ NETWORK_CONFIGS = {
         """).rstrip(' '),
     },
     'v4_and_v6_static': {
-        'expected_eni': textwrap.dedent("""\
+        'expected_eni': dedent("""\
             auto lo
             iface lo inet loopback
 
@@ -519,7 +600,7 @@ NETWORK_CONFIGS = {
                 address 2001:1::1/64
                 mtu 1500
         """).rstrip(' '),
-        'expected_netplan': textwrap.dedent("""
+        'expected_netplan': dedent("""
             network:
                 version: 2
                 ethernets:
@@ -530,7 +611,7 @@ NETWORK_CONFIGS = {
                         mtu: 9000
                         mtu6: 1500
         """).rstrip(' '),
-        'yaml': textwrap.dedent("""\
+        'yaml': dedent("""\
             version: 1
             config:
               - type: 'physical'
@@ -544,7 +625,7 @@ NETWORK_CONFIGS = {
                     mtu: 1500
         """).rstrip(' '),
         'expected_sysconfig': {
-            'ifcfg-iface0': textwrap.dedent("""\
+            'ifcfg-iface0': dedent("""\
                 BOOTPROTO=none
                 DEVICE=iface0
                 IPADDR=192.168.14.2
@@ -645,7 +726,7 @@ iface eth0.101 inet static
 post-up route add -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
 pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
 """),
-        'expected_netplan': textwrap.dedent("""
+        'expected_netplan': dedent("""
             network:
                 version: 2
                 ethernets:
@@ -781,7 +862,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                             - brettanomyces.maas
         """).rstrip(' '),
         'expected_sysconfig': {
-            'ifcfg-bond0': textwrap.dedent("""\
+            'ifcfg-bond0': dedent("""\
                 BONDING_MASTER=yes
                 BONDING_OPTS="mode=active-backup """
                                            """xmit_hash_policy=layer3+4 """
@@ -797,7 +878,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                 ONBOOT=yes
                 TYPE=Bond
                 USERCTL=no"""),
-            'ifcfg-bond0.200': textwrap.dedent("""\
+            'ifcfg-bond0.200': dedent("""\
                 BOOTPROTO=dhcp
                 DEVICE=bond0.200
                 NM_CONTROLLED=no
@@ -806,7 +887,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                 TYPE=Ethernet
                 USERCTL=no
                 VLAN=yes"""),
-            'ifcfg-br0': textwrap.dedent("""\
+            'ifcfg-br0': dedent("""\
                 AGEING=250
                 BOOTPROTO=none
                 DEFROUTE=yes
@@ -822,7 +903,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                 STP=off
                 TYPE=Bridge
                 USERCTL=no"""),
-            'ifcfg-eth0': textwrap.dedent("""\
+            'ifcfg-eth0': dedent("""\
                 BOOTPROTO=none
                 DEVICE=eth0
                 HWADDR=c0:d6:9f:2c:e8:80
@@ -830,7 +911,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                 ONBOOT=yes
                 TYPE=Ethernet
                 USERCTL=no"""),
-            'ifcfg-eth0.101': textwrap.dedent("""\
+            'ifcfg-eth0.101': dedent("""\
                 BOOTPROTO=none
                 DEFROUTE=yes
                 DEVICE=eth0.101
@@ -846,7 +927,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                 TYPE=Ethernet
                 USERCTL=no
                 VLAN=yes"""),
-            'ifcfg-eth1': textwrap.dedent("""\
+            'ifcfg-eth1': dedent("""\
                 BOOTPROTO=none
                 DEVICE=eth1
                 HWADDR=aa:d6:9f:2c:e8:80
@@ -856,7 +937,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                 SLAVE=yes
                 TYPE=Ethernet
                 USERCTL=no"""),
-            'ifcfg-eth2': textwrap.dedent("""\
+            'ifcfg-eth2': dedent("""\
                 BOOTPROTO=none
                 DEVICE=eth2
                 HWADDR=c0:bb:9f:2c:e8:80
@@ -866,7 +947,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                 SLAVE=yes
                 TYPE=Ethernet
                 USERCTL=no"""),
-            'ifcfg-eth3': textwrap.dedent("""\
+            'ifcfg-eth3': dedent("""\
                 BOOTPROTO=none
                 BRIDGE=br0
                 DEVICE=eth3
@@ -875,7 +956,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                 ONBOOT=yes
                 TYPE=Ethernet
                 USERCTL=no"""),
-            'ifcfg-eth4': textwrap.dedent("""\
+            'ifcfg-eth4': dedent("""\
                 BOOTPROTO=none
                 BRIDGE=br0
                 DEVICE=eth4
@@ -884,7 +965,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                 ONBOOT=yes
                 TYPE=Ethernet
                 USERCTL=no"""),
-            'ifcfg-eth5': textwrap.dedent("""\
+            'ifcfg-eth5': dedent("""\
                 BOOTPROTO=dhcp
                 DEVICE=eth5
                 HWADDR=98:bb:9f:2c:e8:8a
@@ -893,7 +974,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                 TYPE=Ethernet
                 USERCTL=no""")
         },
-        'yaml': textwrap.dedent("""
+        'yaml': dedent("""
             version: 1
             config:
                 # Physical interfaces.
@@ -1027,7 +1108,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
         """).lstrip(),
     },
     'bond': {
-        'yaml': textwrap.dedent("""
+        'yaml': dedent("""
             version: 1
             config:
               - type: physical
@@ -1060,7 +1141,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                     address: 2001:1::1/92
             """),
         'expected_sysconfig': {
-            'ifcfg-bond0': textwrap.dedent("""\
+            'ifcfg-bond0': dedent("""\
         BONDING_MASTER=yes
         BONDING_OPTS="mode=active-backup xmit_hash_policy=layer3+4 miimon=100"
         BONDING_SLAVE0=bond0s0
@@ -1081,7 +1162,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
         TYPE=Bond
         USERCTL=no
         """),
-            'ifcfg-bond0s0': textwrap.dedent("""\
+            'ifcfg-bond0s0': dedent("""\
         BOOTPROTO=none
         DEVICE=bond0s0
         HWADDR=aa:bb:cc:dd:e8:00
@@ -1092,14 +1173,14 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
         TYPE=Ethernet
         USERCTL=no
         """),
-            'route6-bond0': textwrap.dedent("""\
+            'route6-bond0': dedent("""\
             """),
-            'route-bond0': textwrap.dedent("""\
+            'route-bond0': dedent("""\
         ADDRESS0=10.1.3.0
         GATEWAY0=192.168.0.3
         NETMASK0=255.255.255.0
         """),
-            'ifcfg-bond0s1': textwrap.dedent("""\
+            'ifcfg-bond0s1': dedent("""\
         BOOTPROTO=none
         DEVICE=bond0s1
         HWADDR=aa:bb:cc:dd:e8:01
@@ -1113,7 +1194,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
         },
     },
     'vlan': {
-        'yaml': textwrap.dedent("""
+        'yaml': dedent("""
             version: 1
             config:
               - type: physical
@@ -1137,7 +1218,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                        network: '::'
             """),
         'expected_sysconfig': {
-            'ifcfg-en0': textwrap.dedent("""\
+            'ifcfg-en0': dedent("""\
                 BOOTPROTO=none
                 DEVICE=en0
                 HWADDR=aa:bb:cc:dd:e8:00
@@ -1145,7 +1226,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                 ONBOOT=yes
                 TYPE=Ethernet
                 USERCTL=no"""),
-            'ifcfg-en0.99': textwrap.dedent("""\
+            'ifcfg-en0.99': dedent("""\
                 BOOTPROTO=none
                 DEFROUTE=yes
                 DEVICE=en0.99
@@ -1166,7 +1247,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
         },
     },
     'bridge': {
-        'yaml': textwrap.dedent("""
+        'yaml': dedent("""
             version: 1
             config:
               - type: physical
@@ -1193,7 +1274,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                   - type: static
                     address: 192.168.2.2/24"""),
         'expected_sysconfig': {
-            'ifcfg-br0': textwrap.dedent("""\
+            'ifcfg-br0': dedent("""\
                 BOOTPROTO=none
                 DEVICE=br0
                 IPADDR=192.168.2.2
@@ -1205,7 +1286,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                 TYPE=Bridge
                 USERCTL=no
                 """),
-            'ifcfg-eth0': textwrap.dedent("""\
+            'ifcfg-eth0': dedent("""\
                 BOOTPROTO=none
                 BRIDGE=br0
                 DEVICE=eth0
@@ -1217,7 +1298,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                 TYPE=Ethernet
                 USERCTL=no
                 """),
-            'ifcfg-eth1': textwrap.dedent("""\
+            'ifcfg-eth1': dedent("""\
                 BOOTPROTO=none
                 BRIDGE=br0
                 DEVICE=eth1
@@ -1232,7 +1313,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
         },
     },
     'manual': {
-        'yaml': textwrap.dedent("""
+        'yaml': dedent("""
             version: 1
             config:
               - type: physical
@@ -1255,7 +1336,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                   - type: manual
                     control: manual
                   """),
-        'expected_eni': textwrap.dedent("""\
+        'expected_eni': dedent("""\
             auto lo
             iface lo inet loopback
 
@@ -1270,7 +1351,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
             # control-manual eth2
             iface eth2 inet manual
             """),
-        'expected_netplan': textwrap.dedent("""\
+        'expected_netplan': dedent("""\
 
             network:
                 version: 2
@@ -1292,7 +1373,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                         set-name: eth2
             """),
         'expected_sysconfig': {
-            'ifcfg-eth0': textwrap.dedent("""\
+            'ifcfg-eth0': dedent("""\
                 BOOTPROTO=none
                 DEVICE=eth0
                 HWADDR=52:54:00:12:34:00
@@ -1303,7 +1384,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                 TYPE=Ethernet
                 USERCTL=no
                 """),
-            'ifcfg-eth1': textwrap.dedent("""\
+            'ifcfg-eth1': dedent("""\
                 BOOTPROTO=none
                 DEVICE=eth1
                 HWADDR=52:54:00:12:34:aa
@@ -1313,7 +1394,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                 TYPE=Ethernet
                 USERCTL=no
                 """),
-            'ifcfg-eth2': textwrap.dedent("""\
+            'ifcfg-eth2': dedent("""\
                 BOOTPROTO=none
                 DEVICE=eth2
                 HWADDR=52:54:00:12:34:ff
@@ -1536,6 +1617,7 @@ class TestSysConfigRendering(CiTestCase):
 
         renderer = sysconfig.Renderer()
         renderer.render_network_state(ns, dir)
+        print(dir2dict(dir))
         return dir2dict(dir)
 
     def _compare_files_to_expected(self, expected, found):
@@ -1879,7 +1961,7 @@ network:
 
 class TestNetplanCleanDefault(CiTestCase):
     snapd_known_path = 'etc/netplan/00-snapd-config.yaml'
-    snapd_known_content = textwrap.dedent("""\
+    snapd_known_content = dedent("""\
         # This is the initial network config.
         # It can be overwritten by cloud-init or console-conf.
         network: