Fix a few bugs introduced in recent changes

Change-Id: Ic939cc65208c4e3eb90f547ffac09ce40924641e
diff --git a/scripts/edgeconfig.py b/scripts/edgeconfig.py
index 2baa9a3..c8a31c2 100644
--- a/scripts/edgeconfig.py
+++ b/scripts/edgeconfig.py
@@ -61,4 +61,7 @@
     yaml_out["dhcpd_subnets"] = dhcpd_subnets
     yaml_out["dhcpd_interfaces"] = dhcpd_interfaces
 
+    if tenant.generate_extra_config():
+        yaml_out.update(tenant.generate_extra_config())
+
     print(yaml.safe_dump(yaml_out, indent=2))