diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-04-09 02:46:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-04-09 02:46:59 +0000 |
| commit | dec6bf3f25f340c2523c9f288400499072bfbe94 (patch) | |
| tree | 1455b2c3bee6b26feb178d58cdca2f34645e119c /lib | |
| parent | fd92fd7332bdd97564ecad0fb87c7e54603b94e2 (diff) | |
| parent | 778593a0d93f1a994c58a30c2dfc3f2243bf1b2f (diff) | |
Merge "nosdn fdio scenario fixes"
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 88aced5b..0ed98fb7 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -248,8 +248,13 @@ EOI 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 + 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}" @@ -291,6 +296,7 @@ EOI 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 |