summaryrefslogtreecommitdiffstats
path: root/lib/overcloud-deploy-functions.sh
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-02-27 23:09:33 -0500
committerFeng Pan <fpan@redhat.com>2017-03-15 00:10:02 -0400
commitde51c2a06ee38af47ef5005821804f4e6f4997f4 (patch)
tree758e4da989c0b205f8e9e1a2eb3347d1df6a7847 /lib/overcloud-deploy-functions.sh
parent7d994a3c3e18227c26bf58049e4d5780144ecf98 (diff)
Add networking-vpp ML2 support
opnfv-tht-pr: 113 opnfv-puppet-tripleo-pr: 16 os-net-config-pr: 5 Change-Id: I0c34889db27fd71e1b73e860850b81a08707c324 Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'lib/overcloud-deploy-functions.sh')
-rwxr-xr-xlib/overcloud-deploy-functions.sh19
1 files changed, 16 insertions, 3 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 4d4b7647..3ffe3b14 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -55,7 +55,7 @@ function overcloud_deploy {
elif [[ -z "${deploy_options_array['sdn_controller']}" || "${deploy_options_array['sdn_controller']}" == 'False' ]]; then
echo -e "${blue}INFO: SDN Controller disabled...will deploy nosdn scenario${reset}"
if [ "${deploy_options_array['vpp']}" == 'True' ]; then
- DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-ml2-networking-vpp.yaml"
+ DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-ml2-vpp.yaml"
fi
SDN_IMAGE=opendaylight
else
@@ -172,6 +172,19 @@ EOI
EOI
fi
+ if [[ -z "${deploy_options_array['sdn_controller']}" || "${deploy_options_array['sdn_controller']}" == 'False' ]]; then
+ if [ "${deploy_options_array['dataplane']}" == "fdio" ]; then
+ if [ "$tenant_nic_mapping_controller_members" == "$tenant_nic_mapping_compute_members" ]; then
+ ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+ sed -i "/NeutronVPPAgentPhysnets:/c\ NeutronVPPAgentPhysnets: 'datacentre:${tenant_nic_mapping_controller_members}'" ${ENV_FILE}
+EOI
+ else
+ echo -e "${red}Compute and Controller must use the same tenant nic name, please modify network setting file.${reset}"
+ exit 1
+ fi
+ fi
+ fi
+
# Set ODL version accordingly
if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && -n "${deploy_options_array['odl_version']}" ]]; then
case "${deploy_options_array['odl_version']}" in
@@ -193,8 +206,8 @@ EOI
EOI
fi
- # Override any previous packages if FDIO and L2
- if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_l3']}" == "False" ]]; then
+ # Override any previous packages if FDIO and ODL L2
+ if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['sdn_l3']}" == "False" ]]; then
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight vpp vpp-devel vpp-api-python vpp-lib vpp-plugins honeycomb" \
--run-command "yum -y install /root/fdio_l2/*.rpm" \