From: Tim Rozet <trozet@redhat.com>
Date: Tue, 16 Oct 2018 16:06:45 +0000 (+0000)
Subject: Merge "Provide libvirt credentials"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=fa61619e64d56bee97df49bc0a80fa6bc7c5da79;hp=-c;p=releng.git

Merge "Provide libvirt credentials"
---

fa61619e64d56bee97df49bc0a80fa6bc7c5da79
diff --combined jjb/functest/functest-alpine.sh
index a34f8a435,d8b337185..17800f25e
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@@ -135,10 -135,13 +135,14 @@@ ssh_options="-o UserKnownHostsFile=/dev
  if [ "${INSTALLER_TYPE}" == 'fuel' ]; then
      COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \
          "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'")
 -    envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}"
 +    IMAGE_PROPERTIES="hw_disk_bus: scsi, hw_scsi_model: virtio-scsi"
 +    envs="${envs} -e POD_ARCH=${COMPUTE_ARCH} -e IMAGE_PROPERTIES=\"${IMAGE_PROPERTIES}\""
  fi
  
+ if [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_SCENARIO} == 'os-nosdn-nofeature-noha' ]]; then
+     libvirt_vol="-v ${ssh_key}:${FUNCTEST_DIR}/conf/libvirt_key"
+     envs="${envs} -e LIBVIRT_USER=ubuntu -e LIBVIRT_KEY_PATH=${FUNCTEST_DIR}/conf/libvirt_key"
+ fi
  
  if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} =~ 'sfc' ]]; then
      ssh_key="/tmp/id_rsa"
@@@ -150,17 -153,8 +154,17 @@@
      envs="${envs} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK}"
  fi
  
 +if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; then
 +    if [[ -n ${IMAGE_PROPERTIES} ]]; then
 +        IMAGE_PROPERTIES="${IMAGE_PROPERTIES}, hw_mem_page_size: large"
 +    else
 +        IMAGE_PROPERTIES="hw_mem_page_size: large"
 +    fi
 +    FLAVOR_EXTRA_SPECS="hw:mem_page_size: large"
 +    envs="${envs} -e IMAGE_PROPERTIES=\"${IMAGE_PROPERTIES}\" -e FLAVOR_EXTRA_SPECS=\"${FLAVOR_EXTRA_SPECS}\""
 +fi
  
- volumes="${images_vol} ${results_vol} ${sshkey_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}"
+ volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}"
  
  ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
  echo 0 > ${ret_val_file}