From 26817bf3c1ce0d076ddd99d24194a00916f6fe0e Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Tue, 11 Apr 2017 16:41:55 -0400 Subject: Removing sdn_l3 and _l2 scenario features JIRA: APEX-429 Change-Id: Ifb28bb27f8e58ac5b180454719dfb329c3edf000 Signed-off-by: Dan Radez --- lib/overcloud-deploy-functions.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib/overcloud-deploy-functions.sh') diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index f26a72a3..332a7115 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" -- cgit 1.2.3-korg