Merge "Fixes tacker heat_uri config"

[apex.git] / lib / python / apex_python_utils.py

diff --git a/lib/python/apex_python_utils.py b/lib/python/apex_python_utils.py
index 8ea40f2..829b3a0 100755 (executable)
--- a/lib/python/apex_python_utils.py
+++ b/lib/python/apex_python_utils.py
@@ -41,7 +41,7 @@ def parse_net_settings(args):
     net_env = NetworkEnvironment(settings, args.net_env_file,
                                  args.compute_pre_config,
                                  args.controller_pre_config)
-    dump_yaml(net_env.get_netenv_settings(), '/tmp/network-environment.yaml')
+    dump_yaml(dict(net_env), '/tmp/network-environment.yaml')
     settings.dump_bash()
 
 
@@ -97,14 +97,13 @@ def build_nic_template(args):
 
     network_settings = NetworkSettings(args.net_settings_file,
                                        args.network_isolation)
-    settings = network_settings.settings_obj
     env = Environment(loader=FileSystemLoader(template_dir))
     template = env.get_template(template)
 
     # gather vlan values into a dict
     net_list = copy(args.enabled_networks).split(' ')
     net_list.remove(ADMIN_NETWORK)
-    vlans_vals = map(lambda x: settings[x]['vlan'], net_list)
+    vlans_vals = map(lambda x: network_settings[x]['vlan'], net_list)
     vlans = dict(zip(net_list, vlans_vals))
     nics = network_settings.nics