diff options
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 16 | ||||
| -rwxr-xr-x | lib/undercloud-functions.sh | 4 |
2 files changed, 20 insertions, 0 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 77b061bd..88aced5b 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -201,6 +201,22 @@ EOI if [ -n "${deploy_options_array['performance']}" ]; then ovs_dpdk_perf_flag="False" for option in "${performance_options[@]}" ; do + if [ "${arr[1]}" == "vpp" ]; then + if [ "${arr[0]}" == "Compute" ]; then + role='NovaCompute' + else + role=${arr[0]} + fi + if [ "${arr[2]}" == "main-core" ]; then + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI + sed -i "/${role}ExtraConfig:/ c\ ${role}ExtraConfig:\n fdio::vpp_cpu_main_core: \"'${arr[3]}'\"" ${ENV_FILE} +EOI + elif [ "${arr[2]}" == "corelist-workers" ]; then + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI + sed -i "/${role}ExtraConfig:/ c\ ${role}ExtraConfig:\n fdio::vpp_cpu_corelist_workers: \"'${arr[3]}'\"" ${ENV_FILE} +EOI + fi + fi arr=($option) # use compute's kernel settings for all nodes for now. if [ "${arr[0]}" == "Compute" ] && [ "${arr[1]}" == "kernel" ]; then diff --git a/lib/undercloud-functions.sh b/lib/undercloud-functions.sh index 2a370bff..7108dcf5 100755 --- a/lib/undercloud-functions.sh +++ b/lib/undercloud-functions.sh @@ -55,6 +55,10 @@ function setup_undercloud_vm { # if the VM is not running update the authkeys and start it if ! virsh list | grep undercloud > /dev/null; then + if [ "$debug" == 'TRUE' ]; then + LIBGUESTFS_BACKEND=direct virt-customize -a $undercloud_dst --root-password password:opnfvapex + fi + echo "Injecting ssh key to Undercloud VM" LIBGUESTFS_BACKEND=direct virt-customize -a $undercloud_dst --run-command "mkdir -p /root/.ssh/" \ --upload ~/.ssh/id_rsa.pub:/root/.ssh/authorized_keys \ |