diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-02-09 22:10:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-09 22:10:54 +0000 |
| commit | 2719f32c6d8bd4d69ebdd5215d43959d224ffc76 (patch) | |
| tree | 80a957e96f862c4acd2e54d4891c8cf860ee30bc /apex | |
| parent | 63000d6dba8990bd01683a6e210cf7e57f3664f7 (diff) | |
| parent | 804160f8ec597ee23a5b5ac18ec6d672586b37b4 (diff) | |
Merge "Adding L2GW Scenario"
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/deploy.py | 1 | ||||
| -rw-r--r-- | apex/overcloud/deploy.py | 1 | ||||
| -rw-r--r-- | apex/settings/deploy_settings.py | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/apex/deploy.py b/apex/deploy.py index f57de8da..d2f7d50b 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -518,6 +518,7 @@ def main(): # 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, diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py index f988cf3d..19d46e15 100644 --- a/apex/overcloud/deploy.py +++ b/apex/overcloud/deploy.py @@ -38,6 +38,7 @@ SDN_FILE_MAP = { 'dvr': 'neutron-opendaylight-fdio-dvr.yaml', 'default': 'neutron-opendaylight-honeycomb.yaml' }, + 'l2gw': 'neutron-l2gw-opendaylight.yaml', 'default': 'neutron-opendaylight.yaml', }, 'onos': { diff --git a/apex/settings/deploy_settings.py b/apex/settings/deploy_settings.py index f2012b24..eec98225 100644 --- a/apex/settings/deploy_settings.py +++ b/apex/settings/deploy_settings.py @@ -23,7 +23,8 @@ REQ_DEPLOY_SETTINGS = ['sdn_controller', 'ceph', 'gluon', 'rt_kvm', - 'os_version'] + 'os_version', + 'l2gw'] OPT_DEPLOY_SETTINGS = ['performance', 'vsperf', |