diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-04-28 08:20:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-04-28 08:20:41 +0000 |
| commit | e74b8e1e863e9d0e541a897e5681275cad40db8a (patch) | |
| tree | 0c9e7a7e76c8dfa21627d724fbcd86df25e2deed /lib | |
| parent | d81cd2087be5edf5d2c0d98ad71a63360ae8511f (diff) | |
| parent | af7aa485a0eb746a7d7c6a5b5dcf00ed9f4eba57 (diff) | |
Merge "Update VPP/ODL versions for FDIO scenarios"
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index d579dc7e..efacaf83 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -252,10 +252,6 @@ EOI echo -e "${blue}INFO: nosdn fdio deployment...installing correct vpp packages...${reset}" ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI sed -i "/NeutronVPPAgentPhysnets:/c\ NeutronVPPAgentPhysnets: 'datacentre:${tenant_nic_mapping_controller_members}'" ${ENV_FILE} - LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum remove -y vpp vpp-api-python vpp-lib vpp-plugins" \ - --run-command "yum install -y /root/fdio_nosdn/*.rpm" \ - --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \ - -a overcloud-full.qcow2 EOI else echo -e "${red}Compute and Controller must use the same tenant nic name, please modify network setting file.${reset}" @@ -285,29 +281,13 @@ EOI EOI fi - # Override ODL if FDIO and ODL L2 - if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then - if [ "${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" \ - --run-command "yum -y install /root/fdio_l2/opendaylight*.rpm" \ - -a overcloud-full.qcow2 -EOI - else - ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI - LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum remove -y vpp vpp-api-python vpp-lib vpp-plugins honeycomb" \ - --run-command "yum -y install /root/fdio_l3/*.rpm" \ - --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \ - -a overcloud-full.qcow2 -EOI - fi - if [ "${deploy_options_array['odl_vpp_netvirt']}" == "True" ]; then - ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI - LIBGUESTFS_BACKEND=direct virt-customize --run-command "rm -rf /opt/opendaylight/*" \ - --run-command "tar zxvf /root/odl-netvirt-vpp-distribution.tar.gz -C /opt/opendaylight/" \ - -a overcloud-full.qcow2 + # Override ODL if we enable netvirt for fdio + if [[ "${deploy_options_array['odl_vpp_netvirt']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI + LIBGUESTFS_BACKEND=direct virt-customize --run-command "rm -rf /opt/opendaylight/*" \ + --run-command "tar zxvf /root/odl-netvirt-vpp-distribution.tar.gz -C /opt/opendaylight/" \ + -a overcloud-full.qcow2 EOI - fi fi # check if ceph should be enabled |