Merge "Adding L2GW Scenario"

diff --combined apex/deploy.py
index f57de8d,3aed977..d2f7d50
--- 1/apex/deploy.py
--- 2/apex/deploy.py
+++ b/apex/deploy.py
@@@ -389,7 -389,7 +389,7 @@@ def main()
              oc_cfg.create_nic_template(net_settings, deploy_settings, role,
                                         args.deploy_dir, APEX_TEMP_DIR)
          # Install Undercloud
 -        undercloud.configure(net_settings,
 +        undercloud.configure(net_settings, deploy_settings,
                               os.path.join(args.lib_dir, ANSIBLE_PATH,
                                            'configure_undercloud.yml'),
                               APEX_TEMP_DIR)
@@@ -518,6 -518,7 +518,7 @@@
          # TODO(trozet): just parse all ds_opts as deploy vars one time
          deploy_vars['sfc'] = ds_opts['sfc']
          deploy_vars['vpn'] = ds_opts['vpn']
+         deploy_vars['l2gw'] = ds_opts.get('l2gw')
          # TODO(trozet): pull all logs and store in tmp dir in overcloud
          # playbook
          post_overcloud = os.path.join(args.lib_dir, ANSIBLE_PATH,