Merge "Fixes removing inventory keys"

diff --combined apex/deploy.py
index 9ebc3f6,0ffd406..3742977
--- 1/apex/deploy.py
--- 2/apex/deploy.py
+++ b/apex/deploy.py
@@@ -83,7 -83,7 +83,7 @@@ def build_vms(inventory, network_settin
              name, volume_path,
              baremetal_interfaces=network_settings.enabled_network_list,
              memory=node['memory'], cpus=node['cpu'],
-             macs=[node['mac_address']],
+             macs=node['mac'],
              template_dir=template_dir)
          virt_utils.host_setup({name: node['pm_port']})
  
@@@ -404,6 -404,7 +404,6 @@@ def main()
              deploy_vars['congress'] = True
          else:
              deploy_vars['congress'] = False
 -        deploy_vars['calipso'] = ds_opts.get('calipso', False)
          # TODO(trozet): this is probably redundant with getting external
          # network info from undercloud.py
          if 'external' in net_settings.enabled_network_list: