diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-08-03 19:23:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-03 19:23:14 +0000 |
| commit | 2912d5cf3ce7f160a33d0ba1fb681c5cbae33944 (patch) | |
| tree | f8beda78de9053794a92e085c3df088f0db4dff2 /lib/overcloud-deploy-functions.sh | |
| parent | 80783b3b94f3f1dba94bcb15d43be311e157120e (diff) | |
| parent | 0cf5b3770e33ed1168e98d557a6dc212ca57f970 (diff) | |
Merge "Adds configuring vpp/hc on all nodes"
Diffstat (limited to 'lib/overcloud-deploy-functions.sh')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 1fcaa0df..e613dae0 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -71,7 +71,7 @@ function overcloud_deploy { scp ${SSH_OPTIONS[@]} $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 "stack@$UNDERCLOUD":overcloud-full.qcow2 # Install ovs-dpdk inside the overcloud image if it is enabled. - if [ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' ]; then + if [[ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' || "${deploy_options_array['dataplane']}" == 'fdio' ]]; then # install dpdk packages before ovs echo -e "${blue}INFO: Enabling kernel modules for dpdk inside overcloud image${reset}" @@ -90,9 +90,16 @@ EOF --upload uio_pci_generic.modules:/etc/sysconfig/modules/ \ --run-command "chmod 0755 /etc/sysconfig/modules/vfio_pci.modules" \ --run-command "chmod 0755 /etc/sysconfig/modules/uio_pci_generic.modules" \ - --run-command "yum install -y /root/dpdk_rpms/*" \ -a overcloud-full.qcow2 + + if [ "${deploy_options_array['dataplane']}" == 'fdio' ]; then + sed -i '/FdioEnabled:/c\ FdioEnabled: true' opnfv-environment.yaml + else + LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/dpdk_rpms/*" \ + -a overcloud-full.qcow2 + fi EOI + elif [ "${deploy_options_array['dataplane']}" != 'ovs' ]; then echo "${red}${deploy_options_array['dataplane']} not supported${reset}" exit 1 @@ -150,6 +157,12 @@ popd /bin/rm -rf ipa/ EOI + # set NIC heat params and resource registry + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI +sed -i '/TenantNIC:/c\ TenantNIC: '${private_network_compute_interface} opnfv-environment.yaml +sed -i '/PublicNIC:/c\ PublicNIC: '${public_network_compute_interface} opnfv-environment.yaml +EOI + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml" fi |