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/overcloud-deploy-functions.sh | |
| parent | b411839804e6fca023ef7a695bbb616ea80fd6f3 (diff) | |
| parent | 26817bf3c1ce0d076ddd99d24194a00916f6fe0e (diff) | |
Merge "Removing sdn_l3 and _l2 scenario features"
Diffstat (limited to 'lib/overcloud-deploy-functions.sh')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 4 |
1 files changed, 1 insertions, 3 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" |