diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-17 18:08:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-17 18:08:26 +0000 |
| commit | cdeac78e8253804bbb486d8fc24fefbec928d796 (patch) | |
| tree | 4b71b0edd9c6b7d46a832747df67d2b6cf936700 /lib | |
| parent | c6ba57aa15f96e4a147b09bf796b67d0357a096b (diff) | |
| parent | de51c2a06ee38af47ef5005821804f4e6f4997f4 (diff) | |
Merge "Add networking-vpp ML2 support"
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 72364ae4..36346d85 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-api-python vpp-lib vpp-plugins honeycomb" \ --run-command "yum -y install /root/fdio_l2/*.rpm" \ |