diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-05-17 20:31:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-17 20:31:17 +0000 |
| commit | 55fdc0e0418ea23a4ca208ae3285e03e04a612e5 (patch) | |
| tree | 9a5bdc394df9193b251290bc215be34eeb9cf35c /lib | |
| parent | b411839804e6fca023ef7a695bbb616ea80fd6f3 (diff) | |
| parent | 26817bf3c1ce0d076ddd99d24194a00916f6fe0e (diff) | |
Merge "Removing sdn_l3 and _l2 scenario features"
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 4 | ||||
| -rw-r--r-- | lib/python/apex/deploy_settings.py | 1 | ||||
| -rwxr-xr-x | lib/python/apex_python_utils.py | 10 | ||||
| -rwxr-xr-x | lib/undercloud-functions.sh | 10 |
4 files changed, 9 insertions, 16 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 1c5e4d0a..e125eb62 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -36,10 +36,8 @@ function overcloud_deploy { elif [ "${deploy_options_array['vpp']}" == 'True' ]; then if [ "${deploy_options_array['odl_vpp_netvirt']}" == "True" ]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-netvirt-vpp.yaml" - elif [ "${deploy_options_array['sdn_l3']}" == "True" ]; then - DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb.yaml" else - DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb-l2.yaml" + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb.yaml" fi else DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight.yaml" diff --git a/lib/python/apex/deploy_settings.py b/lib/python/apex/deploy_settings.py index 48ce340d..1025fcea 100644 --- a/lib/python/apex/deploy_settings.py +++ b/lib/python/apex/deploy_settings.py @@ -15,7 +15,6 @@ from .common import utils REQ_DEPLOY_SETTINGS = ['sdn_controller', 'odl_version', - 'sdn_l3', 'tacker', 'congress', 'dataplane', diff --git a/lib/python/apex_python_utils.py b/lib/python/apex_python_utils.py index 1f49d474..c4c6dfe8 100755 --- a/lib/python/apex_python_utils.py +++ b/lib/python/apex_python_utils.py @@ -113,16 +113,14 @@ def build_nic_template(args): if ds['dataplane'] == 'fdio': nets['tenant']['nic_mapping'][args.role]['phys_type'] = 'vpp_interface' - if ds['sdn_l3']: - nets['external'][0]['nic_mapping'][args.role]['phys_type'] =\ - 'vpp_interface' + nets['external'][0]['nic_mapping'][args.role]['phys_type'] =\ + 'vpp_interface' if ds.get('performance', {}).get(args.role.title(), {}).get('vpp', {})\ .get('uio-driver'): nets['tenant']['nic_mapping'][args.role]['uio-driver'] =\ ds['performance'][args.role.title()]['vpp']['uio-driver'] - if ds['sdn_l3']: - nets['external'][0]['nic_mapping'][args.role]['uio-driver'] =\ - ds['performance'][args.role.title()]['vpp']['uio-driver'] + nets['external'][0]['nic_mapping'][args.role]['uio-driver'] =\ + ds['performance'][args.role.title()]['vpp']['uio-driver'] if ds.get('performance', {}).get(args.role.title(), {}).get('vpp', {})\ .get('interface-options'): nets['tenant']['nic_mapping'][args.role]['interface-options'] =\ diff --git a/lib/undercloud-functions.sh b/lib/undercloud-functions.sh index d324b0b8..3bd0341a 100755 --- a/lib/undercloud-functions.sh +++ b/lib/undercloud-functions.sh @@ -135,12 +135,10 @@ function configure_undercloud { scp ${SSH_OPTIONS[@]} $APEX_TMP_DIR/network-environment.yaml "stack@$UNDERCLOUD": # check for ODL L3/ONOS - if [ "${deploy_options_array['sdn_l3']}" == 'True' ]; then - if [ "${deploy_options_array['dataplane']}" == 'fdio' ]; then - ext_net_type=vpp_interface - else - ext_net_type=br-ex - fi + if [ "${deploy_options_array['dataplane']}" == 'fdio' ]; then + ext_net_type=vpp_interface + else + ext_net_type=br-ex fi if [ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' ]; then |