Merge "Configuration for Testing Live Migration"
authorSam Hague <shague@redhat.com>
Wed, 20 Jun 2018 20:08:01 +0000 (20:08 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 20 Jun 2018 20:08:01 +0000 (20:08 +0000)
1  2 
jjb/integration/integration-deploy-openstack-run-test.sh

index c049fd152325027f5468b4ee4a057f26a8f0f785,4d80663ecc297feb0493e4393a3d3e9130555f07..7ce45c96dbc1e231f82b53c1b59370c9a041aa84
@@@ -20,10 -20,7 +20,10 @@@ python ${WORKSPACE}/test/tools/distchan
  
  printf "\nshowing recent changes that made it into integration/test used by this job:\n"
  cd ${WORKSPACE}/test
 -git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s' -n10
 +printf "Hash    Author Date                    Commit Date                    Author               Subject\n"
 +printf "%s\n" "------- ------------------------------ ------------------------------ -------------------- -----------------------------"
 +git --no-pager log --pretty=format:'%h %<(30)%ad %<(30)%cd %<(20,trunc)%an%d %s' -n20
 +printf "\n"
  cd -
  
  cat << EOF
@@@ -40,6 -37,7 +40,6 @@@ function trap_handler() 
      local lasterr="$2"
      echo "trap_hanlder: ${prog}: line ${lastline}: exit status of last command: ${lasterr}"
      echo "trap_handler: command: ${BASH_COMMAND}"
 -    collect_logs
      exit 1
  } # trap_handler()
  
@@@ -77,7 -75,6 +77,7 @@@ ENABLE_OS_PLUGINS: ${ENABLE_OS_PLUGINS
  DISABLE_OS_SERVICES: ${DISABLE_OS_SERVICES}
  TENANT_NETWORK_TYPE: ${TENANT_NETWORK_TYPE}
  SECURITY_GROUP_MODE: ${SECURITY_GROUP_MODE}
 +ENABLE_ITM_DIRECT_TUNNELS: ${ENABLE_ITM_DIRECT_TUNNELS}
  PUBLIC_PHYSICAL_NETWORK: ${PUBLIC_PHYSICAL_NETWORK}
  ENABLE_NETWORKING_L2GW: ${ENABLE_NETWORKING_L2GW}
  CREATE_INITIAL_NETWORKS: ${CREATE_INITIAL_NETWORKS}
@@@ -186,6 -183,44 +186,44 @@@ function install_rdo_release() 
      esac
  }
  
+ # Involves just setting up the shared directory
+ function setup_live_migration_control() {
+     local control_ip=$1
+     printf "${control_ip}:Setup directory Share with NFS"
+     cat > ${WORKSPACE}/setup_live_migration_control.sh << EOF
+ sudo mkdir --mode=777 /vm_instances
+ sudo chown -R jenkins:jenkins /vm_instances
+ sudo yum install -y nfs-utils
+ printf "/vm_instances *(rw,no_root_squash)" | sudo tee -a /etc/exports
+ sudo systemctl start rpcbind nfs-server
+ sudo exportfs
+ EOF
+     scp ${WORKSPACE}/setup_live_migration_control.sh ${control_ip}:/tmp/setup_live_migration_control.sh
+     ssh ${control_ip} "bash /tmp/setup_live_migration_control.sh"
+ }
+ # Involves mounting the share and configuring the libvirtd
+ function setup_live_migration_compute() {
+     local compute_ip=$1
+     local control_ip=$2
+     printf "${compute_ip}:Mount Shared directory from ${control_ip}"
+     printf "${compute_ip}:Configure libvirt in listen mode"
+     cat >  ${WORKSPACE}/setup_live_migration_compute.sh << EOF
+ sudo yum install -y libvirt libvirt-devel nfs-utils
+ sudo crudini --verbose  --set --inplace /etc/libvirt/libvirtd.conf '' listen_tls 0
+ sudo crudini --verbose  --set --inplace /etc/libvirt/libvirtd.conf '' listen_tcp 1
+ sudo crudini --verbose  --set --inplace /etc/libvirt/libvirtd.conf '' auth_tcp '"none"'
+ sudo crudini --verbose  --set --inplace /etc/sysconfig/libvirtd '' LIBVIRTD_ARGS '"--listen"'
+ sudo mkdir --mode=777 -p /var/instances
+ sudo chown -R jenkins:jenkins /var/instances
+ sudo chmod o+x /var/instances
+ sudo systemctl start rpcbind
+ sudo mount -t nfs ${control_ip}:/vm_instances /var/instances
+ sudo mount
+ EOF
+     scp ${WORKSPACE}/setup_live_migration_compute.sh ${compute_ip}:/tmp/setup_live_migration_compute.sh
+     ssh ${compute_ip} "bash /tmp/setup_live_migration_compute.sh"
+ }
  
  # Add enable_services and disable_services to the local.conf
  function add_os_services() {
@@@ -224,9 -259,8 +262,8 @@@ function create_control_node_local_conf
      cat > ${local_conf_file_name} << EOF
  [[local|localrc]]
  LOGFILE=stack.sh.log
- USE_SCREEN=True
- SCREEN_LOGDIR=/opt/stack/data/log
  LOG_COLOR=False
+ USE_SYSTEMD=True
  RECLONE=${RECLONE}
  # Increase the wait used by stack to poll for services
  SERVICE_TIMEOUT=120
@@@ -275,6 -309,7 +312,6 @@@ EO
      if [ "${ODL_ML2_DRIVER_VERSION}" == "v2" ]; then
          echo "ODL_V2DRIVER=True" >> ${local_conf_file_name}
      fi
 -
      IFS=,
      for plugin_name in ${ENABLE_OS_PLUGINS}; do
          if [ "$plugin_name" == "networking-odl" ]; then
              ENABLE_PLUGIN_ARGS="${DEVSTACK_LBAAS_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
              IS_LBAAS_PLUGIN_ENABLED="yes"
          elif [ "$plugin_name" == "networking-sfc" ]; then
 -            ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
 +            ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} master"
 +            IS_SFC_PLUGIN_ENABLED="yes"
          else
              echo "Error: Invalid plugin $plugin_name, unsupported"
              continue
@@@ -326,9 -360,6 +363,9 @@@ EO
          if [ "${IS_LBAAS_PLUGIN_ENABLED}" == "yes" ]; then
              SERVICE_PLUGINS+=", lbaasv2"
          fi
 +        if [ "${IS_SFC_PLUGIN_ENABLED}" == "yes" ]; then
 +            SERVICE_PLUGINS+=", networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,networking_sfc.services.sfc.plugin.SfcPlugin"
 +        fi
      fi #check for ODL_ENABLE_L3_FWD
  
      cat >> ${local_conf_file_name} << EOF
  [[post-config|\$NEUTRON_CONF]]
  [DEFAULT]
  service_plugins = ${SERVICE_PLUGINS}
+ log_dir = /opt/stack/logs
  
  [[post-config|/etc/neutron/plugins/ml2/ml2_conf.ini]]
  [agent]
@@@ -351,11 -383,13 +389,13 @@@ path_mtu = 145
  [DEFAULT]
  force_metadata = True
  enable_isolated_metadata = True
+ log_dir = /opt/stack/logs
  
  [[post-config|/etc/nova/nova.conf]]
  [DEFAULT]
  force_config_drive = False
  force_raw_images = False
+ log_dir = /opt/stack/logs
  
  [scheduler]
  discover_hosts_in_cells_interval = 30
@@@ -376,8 -410,7 +416,7 @@@ function create_compute_node_local_conf
  [[local|localrc]]
  LOGFILE=stack.sh.log
  LOG_COLOR=False
- USE_SCREEN=True
- SCREEN_LOGDIR=/opt/stack/data/log
+ USE_SYSTEMD=True
  RECLONE=${RECLONE}
  # Increase the wait used by stack to poll for the nova service on the control node
  NOVA_READY_TIMEOUT=1800
@@@ -438,6 -471,10 +477,10 @@@ auth_strategy = keyston
  [DEFAULT]
  use_neutron = True
  force_raw_images = False
+ log_dir = /opt/stack/logs
+ [libvirt]
+ live_migration_uri = qemu+tcp://%s/system
+ virt_type = qemu
  EOF
  
      echo "Compute local.conf created:"
@@@ -519,6 -556,286 +562,6 @@@ EO
      ${SSH} ${MGRIP} "sudo bash /tmp/deploy_ha_proxy.sh"
  } # configure_haproxy_for_neutron_requests()
  
 -# Collect the list of files on the hosts
 -function collect_files() {
 -    local -r ip=$1
 -    local -r folder=$2
 -    finddir=/tmp/finder
 -    ${SSH} ${ip} "mkdir -p ${finddir}"
 -    ${SSH} ${ip} "sudo find /etc > ${finddir}/find.etc.txt"
 -    ${SSH} ${ip} "sudo find /opt/stack > ${finddir}/find.opt.stack.txt"
 -    ${SSH} ${ip} "sudo find /var > ${finddir}/find2.txt"
 -    ${SSH} ${ip} "sudo find /var > ${finddir}/find.var.txt"
 -    ${SSH} ${ip} "sudo tar -cf - -C /tmp finder | xz -T 0 > /tmp/find.tar.xz"
 -    scp ${ip}:/tmp/find.tar.xz ${folder}
 -    mkdir -p ${finddir}
 -    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/etc/ > ${finddir}/rsync.etc.txt
 -    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/opt/stack/ > ${finddir}/rsync.opt.stack.txt
 -    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/var/ > ${finddir}/rsync.var.txt
 -    tar -cf - -C /tmp finder | xz -T 0 > /tmp/rsync.tar.xz
 -    cp /tmp/rsync.tar.xz ${folder}
 -}
 -
 -# List of extra services to extract from journalctl
 -# Add new services on a separate line, in alpha order, add \ at the end
 -extra_services_cntl=" \
 -    dnsmasq.service \
 -    httpd.service \
 -    libvirtd.service \
 -    openvswitch.service \
 -    ovs-vswitchd.service \
 -    ovsdb-server.service \
 -    rabbitmq-server.service \
 -"
 -
 -extra_services_cmp=" \
 -    libvirtd.service \
 -    openvswitch.service \
 -    ovs-vswitchd.service \
 -    ovsdb-server.service \
 -"
 -
 -# Collect the logs for the openstack services
 -# First get all the services started by devstack which would have devstack@ as a prefix
 -# Next get all the extra services
 -function collect_openstack_logs() {
 -    local -r ip=${1}
 -    local -r folder=${2}
 -    local -r node_type=${3}
 -    local oslogs="${folder}/oslogs"
 -
 -    printf "collect_openstack_logs for ${node_type} node: ${ip} into ${oslogs}\n"
 -    rm -rf ${oslogs}
 -    mkdir -p ${oslogs}
 -    # There are always some logs in /opt/stack/logs and this also covers the
 -    # pre-queens branches which always use /opt/stack/logs
 -    rsync -avhe ssh ${ip}:/opt/stack/logs/* ${oslogs} # rsync to prevent copying of symbolic links
 -
 -    # Starting with queens break out the logs from journalctl
 -    if [ "${OPENSTACK_BRANCH}" = "stable/queens" ]; then
 -        cat > ${WORKSPACE}/collect_openstack_logs.sh << EOF
 -extra_services_cntl="${extra_services_cntl}"
 -extra_services_cmp="${extra_services_cmp}"
 -
 -function extract_from_journal() {
 -    local -r services=\${1}
 -    local -r folder=\${2}
 -    local -r node_type=\${3}
 -    printf "extract_from_journal folder: \${folder}, services: \${services}\n"
 -    for service in \${services}; do
 -        # strip anything before @ and anything after .
 -        # devstack@g-api.service will end as g-api
 -        service_="\${service#*@}"
 -        service_="\${service_%.*}"
 -        sudo journalctl -u "\${service}" > "\${folder}/\${service_}.log"
 -    done
 -}
 -
 -rm -rf /tmp/oslogs
 -mkdir -p /tmp/oslogs
 -systemctl list-unit-files --all > /tmp/oslogs/systemctl.units.log 2>&1
 -svcs=\$(grep devstack@ /tmp/oslogs/systemctl.units.log | awk '{print \$1}')
 -extract_from_journal "\${svcs}" "/tmp/oslogs"
 -if [ "\${node_type}" = "control" ]; then
 -    extract_from_journal "\${extra_services_cntl}" "/tmp/oslogs"
 -else
 -    extract_from_journal "\${extra_services_cmp}" "/tmp/oslogs"
 -fi
 -ls -al /tmp/oslogs
 -EOF
 -        printf "collect_openstack_logs for ${node_type} node: ${ip} into ${oslogs}, executing script\n"
 -        cat ${WORKSPACE}/collect_openstack_logs.sh
 -        scp ${WORKSPACE}/collect_openstack_logs.sh ${ip}:/tmp
 -        ${SSH} ${ip} "bash /tmp/collect_openstack_logs.sh > /tmp/collect_openstack_logs.log 2>&1"
 -        rsync -avhe ssh ${ip}:/tmp/oslogs/* ${oslogs}
 -        scp ${ip}:/tmp/collect_openstack_logs.log ${oslogs}
 -    fi
 -}
 -
 -function collect_logs() {
 -    set +e  # We do not want to create red dot just because something went wrong while fetching logs.
 -
 -    cat > extra_debug.sh << EOF
 -echo -e "/usr/sbin/lsmod | /usr/bin/grep openvswitch\n"
 -/usr/sbin/lsmod | /usr/bin/grep openvswitch
 -echo -e "\nsudo grep ct_ /var/log/openvswitch/ovs-vswitchd.log\n"
 -sudo grep "Datapath supports" /var/log/openvswitch/ovs-vswitchd.log
 -echo -e "\nsudo netstat -punta\n"
 -sudo netstat -punta
 -echo -e "\nsudo getenforce\n"
 -sudo getenforce
 -echo -e "\nsudo systemctl status httpd\n"
 -sudo systemctl status httpd
 -echo -e "\nenv\n"
 -env
 -source /opt/stack/devstack/openrc admin admin
 -echo -e "\nenv after openrc\n"
 -env
 -echo -e "\nsudo du -hs /opt/stack"
 -sudo du -hs /opt/stack
 -echo -e "\nsudo mount"
 -sudo mount
 -echo -e "\ndmesg -T > /tmp/dmesg.log"
 -dmesg -T > /tmp/dmesg.log
 -echo -e "\njournalctl > /tmp/journalctl.log\n"
 -sudo journalctl > /tmp/journalctl.log
 -echo -e "\novsdb-tool -mm show-log > /tmp/ovsdb-tool.log"
 -ovsdb-tool -mm show-log > /tmp/ovsdb-tool.log
 -EOF
 -
 -    # Since this log collection work is happening before the archive build macro which also
 -    # creates the ${WORKSPACE}/archives dir, we have to do it here first.  The mkdir in the
 -    # archives build step will essentially be a noop.
 -    mkdir -p ${WORKSPACE}/archives
 -
 -    mv /tmp/changes.txt ${WORKSPACE}/archives
 -    mv ${WORKSPACE}/rabbit.txt ${WORKSPACE}/archives
 -
 -    sleep 5
 -    # FIXME: Do not create .tar and gzip before copying.
 -    for i in `seq 1 ${NUM_ODL_SYSTEM}`; do
 -        CONTROLLERIP=ODL_SYSTEM_${i}_IP
 -        echo "collect_logs: for opendaylight controller ip: ${!CONTROLLERIP}"
 -        NODE_FOLDER="odl_${i}"
 -        mkdir -p ${NODE_FOLDER}
 -        echo "Lets's take the karaf thread dump again..."
 -        ssh ${!CONTROLLERIP} "sudo ps aux" > ${WORKSPACE}/ps_after.log
 -        pid=$(grep org.apache.karaf.main.Main ${WORKSPACE}/ps_after.log | grep -v grep | tr -s ' ' | cut -f2 -d' ')
 -        echo "karaf main: org.apache.karaf.main.Main, pid:${pid}"
 -        ssh ${!CONTROLLERIP} "jstack ${pid}" > ${WORKSPACE}/karaf_${i}_${pid}_threads_after.log || true
 -        echo "killing karaf process..."
 -        ${SSH} "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
 -        ${SSH} ${!CONTROLLERIP} "sudo journalctl > /tmp/journalctl.log"
 -        scp ${!CONTROLLERIP}:/tmp/journalctl.log ${NODE_FOLDER}
 -        ${SSH} ${!CONTROLLERIP} "dmesg -T > /tmp/dmesg.log"
 -        scp ${!CONTROLLERIP}:/tmp/dmesg.log ${NODE_FOLDER}
 -        ${SSH} ${!CONTROLLERIP} "tar -cf - -C /tmp/${BUNDLEFOLDER} etc | xz -T 0 > /tmp/etc.tar.xz"
 -        scp ${!CONTROLLERIP}:/tmp/etc.tar.xz ${NODE_FOLDER}
 -        ${SSH} ${!CONTROLLERIP} "cp -r /tmp/${BUNDLEFOLDER}/data/log /tmp/odl_log"
 -        ${SSH} ${!CONTROLLERIP} "tar -cf /tmp/odl${i}_karaf.log.tar /tmp/odl_log/*"
 -        scp ${!CONTROLLERIP}:/tmp/odl${i}_karaf.log.tar ${NODE_FOLDER}
 -        ${SSH} ${!CONTROLLERIP} "tar -cf /tmp/odl${i}_zrpcd.log.tar /tmp/zrpcd.init.log"
 -        scp ${!CONTROLLERIP}:/tmp/odl${i}_zrpcd.log.tar ${NODE_FOLDER}
 -        tar -xvf ${NODE_FOLDER}/odl${i}_karaf.log.tar -C ${NODE_FOLDER} --strip-components 2 --transform s/karaf/odl${i}_karaf/g
 -        grep "ROBOT MESSAGE\| ERROR " ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_err.log
 -        grep "ROBOT MESSAGE\| ERROR \| WARN \|Exception" \
 -            ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_err_warn_exception.log
 -        # Print ROBOT lines and print Exception lines. For exception lines also print the previous line for context
 -        sed -n -e '/ROBOT MESSAGE/P' -e '$!N;/Exception/P;D' ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_exception.log
 -        rm ${NODE_FOLDER}/odl${i}_karaf.log.tar
 -        mv *_threads* ${NODE_FOLDER}
 -        mv ps_* ${NODE_FOLDER}
 -        mv ${NODE_FOLDER} ${WORKSPACE}/archives/
 -    done
 -
 -    print_job_parameters > ${WORKSPACE}/archives/params.txt
 -
 -    # Control Node
 -    for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
 -        OSIP=OPENSTACK_CONTROL_NODE_${i}_IP
 -        echo "collect_logs: for openstack control node ip: ${!OSIP}"
 -        NODE_FOLDER="control_${i}"
 -        mkdir -p ${NODE_FOLDER}
 -        scp extra_debug.sh ${!OSIP}:/tmp
 -        ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log 2>&1"
 -        scp ${!OSIP}:/etc/dnsmasq.conf ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/keystone/keystone.conf ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/keystone/keystone-uwsgi-admin.ini ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/keystone/keystone-uwsgi-public.ini ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/kuryr/kuryr.conf ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/neutron/dhcp_agent.ini ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/neutron/metadata_agent.ini ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/neutron/neutron.conf ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/neutron/neutron_lbaas.conf ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/neutron/plugins/ml2/ml2_conf.ini ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/neutron/services/loadbalancer/haproxy/lbaas_agent.ini ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/nova/nova.conf ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/nova/nova-api-uwsgi.ini ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/nova/nova_cell1.conf ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/nova/nova-cpu.conf ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/nova/placement-uwsgi.ini ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/openstack/clouds.yaml ${NODE_FOLDER}
 -        scp ${!OSIP}:/opt/stack/devstack/.stackenv ${NODE_FOLDER}
 -        scp ${!OSIP}:/opt/stack/devstack/nohup.out ${NODE_FOLDER}/stack.log
 -        scp ${!OSIP}:/opt/stack/devstack/openrc ${NODE_FOLDER}
 -        scp ${!OSIP}:/opt/stack/requirements/upper-constraints.txt ${NODE_FOLDER}
 -        scp ${!OSIP}:/opt/stack/tempest/etc/tempest.conf ${NODE_FOLDER}
 -        scp ${!OSIP}:/tmp/*.xz ${NODE_FOLDER}
 -        scp ${!OSIP}:/tmp/dmesg.log ${NODE_FOLDER}
 -        scp ${!OSIP}:/tmp/extra_debug.log ${NODE_FOLDER}
 -        scp ${!OSIP}:/tmp/get_devstack.sh.txt ${NODE_FOLDER}
 -        scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER}
 -        scp ${!OSIP}:/tmp/ovsdb-tool.log ${NODE_FOLDER}
 -        collect_files "${!OSIP}" "${NODE_FOLDER}"
 -        ${SSH} ${!OSIP} "sudo tar -cf - -C /var/log rabbitmq | xz -T 0 > /tmp/rabbitmq.tar.xz "
 -        scp ${!OSIP}:/tmp/rabbitmq.tar.xz ${NODE_FOLDER}
 -        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/etc/hosts ${NODE_FOLDER}
 -        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/usr/lib/systemd/system/haproxy.service ${NODE_FOLDER}
 -        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/audit/audit.log ${NODE_FOLDER}
 -        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/httpd/keystone_access.log ${NODE_FOLDER}
 -        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/httpd/keystone.log ${NODE_FOLDER}
 -        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages* ${NODE_FOLDER}
 -        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
 -        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
 -        collect_openstack_logs "${!OSIP}" "${NODE_FOLDER}" "control"
 -        mv local.conf_control_${!OSIP} ${NODE_FOLDER}/local.conf
 -        # qdhcp files are created by robot tests and copied into /tmp/qdhcp during the test
 -        tar -cf - -C /tmp qdhcp | xz -T 0 > /tmp/qdhcp.tar.xz
 -        mv /tmp/qdhcp.tar.xz ${NODE_FOLDER}
 -        mv ${NODE_FOLDER} ${WORKSPACE}/archives/
 -    done
 -
 -    # Compute Nodes
 -    for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
 -        OSIP=OPENSTACK_COMPUTE_NODE_${i}_IP
 -        echo "collect_logs: for openstack compute node ip: ${!OSIP}"
 -        NODE_FOLDER="compute_${i}"
 -        mkdir -p ${NODE_FOLDER}
 -        scp extra_debug.sh ${!OSIP}:/tmp
 -        ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log 2>&1"
 -        scp ${!OSIP}:/etc/nova/nova.conf ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/nova/nova-cpu.conf ${NODE_FOLDER}
 -        scp ${!OSIP}:/etc/openstack/clouds.yaml ${NODE_FOLDER}
 -        scp ${!OSIP}:/opt/stack/devstack/.stackenv ${NODE_FOLDER}
 -        scp ${!OSIP}:/opt/stack/devstack/nohup.out ${NODE_FOLDER}/stack.log
 -        scp ${!OSIP}:/opt/stack/devstack/openrc ${NODE_FOLDER}
 -        scp ${!OSIP}:/opt/stack/requirements/upper-constraints.txt ${NODE_FOLDER}
 -        scp ${!OSIP}:/tmp/*.xz ${NODE_FOLDER}/
 -        scp ${!OSIP}:/tmp/dmesg.log ${NODE_FOLDER}
 -        scp ${!OSIP}:/tmp/extra_debug.log ${NODE_FOLDER}
 -        scp ${!OSIP}:/tmp/get_devstack.sh.txt ${NODE_FOLDER}
 -        scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER}
 -        scp ${!OSIP}:/tmp/ovsdb-tool.log ${NODE_FOLDER}
 -        collect_files "${!OSIP}" "${NODE_FOLDER}"
 -        ${SSH} ${!OSIP} "sudo tar -cf - -C /var/log libvirt | xz -T 0 > /tmp/libvirt.tar.xz "
 -        scp ${!OSIP}:/tmp/libvirt.tar.xz ${NODE_FOLDER}
 -        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/etc/hosts ${NODE_FOLDER}
 -        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/audit/audit.log ${NODE_FOLDER}
 -        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages* ${NODE_FOLDER}
 -        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/nova-agent.log ${NODE_FOLDER}
 -        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
 -        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
 -        collect_openstack_logs "${!OSIP}" "${NODE_FOLDER}" "compute"
 -        mv local.conf_compute_${!OSIP} ${NODE_FOLDER}/local.conf
 -        mv ${NODE_FOLDER} ${WORKSPACE}/archives/
 -    done
 -
 -    # Tempest
 -    DEVSTACK_TEMPEST_DIR="/opt/stack/tempest"
 -    TESTREPO=".stestr"
 -    TEMPEST_LOGS_DIR=${WORKSPACE}/archives/tempest
 -    # Look for tempest test results in the $TESTREPO dir and copy if found
 -    if ${SSH} ${OPENSTACK_CONTROL_NODE_1_IP} "sudo sh -c '[ -f ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/0 ]'"; then
 -        ${SSH} ${OPENSTACK_CONTROL_NODE_1_IP} "for I in \$(sudo ls ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/ | grep -E '^[0-9]+$'); do sudo sh -c \"${DEVSTACK_TEMPEST_DIR}/.tox/tempest/bin/subunit-1to2 < ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/\${I} >> ${DEVSTACK_TEMPEST_DIR}/subunit_log.txt\"; done"
 -        ${SSH} ${OPENSTACK_CONTROL_NODE_1_IP} "sudo sh -c '${DEVSTACK_TEMPEST_DIR}/.tox/tempest/bin/python ${DEVSTACK_TEMPEST_DIR}/.tox/tempest/lib/python2.7/site-packages/os_testr/subunit2html.py ${DEVSTACK_TEMPEST_DIR}/subunit_log.txt ${DEVSTACK_TEMPEST_DIR}/tempest_results.html'"
 -        mkdir -p ${TEMPEST_LOGS_DIR}
 -        scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest_results.html ${TEMPEST_LOGS_DIR}
 -        scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest.log ${TEMPEST_LOGS_DIR}
 -    else
 -        echo "tempest results not found in ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/0"
 -    fi
 -} # collect_logs()
 -
  # Following three functions are debugging helpers when debugging devstack changes.
  # Keeping them for now so we can simply call them when needed.
  ctrlhn=""
@@@ -708,8 -1025,18 +751,8 @@@ if [ -n "${DEVSTACK_HASH}" ]; the
      echo "git checkout ${DEVSTACK_HASH}"
      git checkout ${DEVSTACK_HASH}
  fi
 -echo "workaround: Restore NEUTRON_CREATE_INITIAL_NETWORKS flag"
 -if [ "${OPENSTACK_BRANCH}" == "stable/queens" ]; then
 -    git config --local user.email jenkins@opendaylight.org
 -    git config --local user.name jenkins
 -    git fetch https://git.openstack.org/openstack-dev/devstack refs/changes/99/550499/1 && git cherry-pick FETCH_HEAD
 -fi
  git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s%b' -n20
  echo
 -echo "workaround: adjust wait from 60s to 1800s (30m)"
 -sed -i 's/wait_for_compute 60/wait_for_compute 1800/g' /opt/stack/devstack/lib/nova
 -# TODO: modify sleep 1 to sleep 60, search wait_for_compute, then first sleep 1
 -# that would just reduce the number of logs in the compute stack.log
  
  echo "workaround: do not upgrade openvswitch"
  sudo yum install -y yum-plugin-versionlock
@@@ -776,6 -1103,7 +819,7 @@@ for i in `seq 1 ${NUM_OPENSTACK_CONTROL
      scp ${WORKSPACE}/local.conf_control_${!CONTROLIP} ${!CONTROLIP}:/opt/stack/devstack/local.conf
      echo "Install rdo release to avoid incompatible Package versions"
      install_rdo_release ${!CONTROLIP}
+     setup_live_migration_control ${!CONTROLIP}
      echo "Stack the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${CONTROLIP}"
      ssh ${!CONTROLIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
      ssh ${!CONTROLIP} "ps -ef | grep stack.sh"
@@@ -806,6 -1134,7 +850,6 @@@ if [ ${NUM_OPENSTACK_COMPUTE_NODES} -g
        echo "rabbitmq is ready, starting ${NUM_OPENSTACK_COMPUTE_NODES} compute(s)"
      else
        echo "rabbitmq was not ready in ${WAIT_FOR_RABBITMQ_MINUTES}m"
 -      collect_logs
        exit 1
      fi
  fi
@@@ -832,6 -1161,7 +876,7 @@@ for i in `seq 1 ${NUM_OPENSTACK_COMPUTE
      scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf
      echo "Install rdo release to avoid incompatible Package versions"
      install_rdo_release ${!COMPUTEIP}
+     setup_live_migration_compute ${!COMPUTEIP} ${!CONTROLIP}
      echo "Stack the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${COMPUTEIP}"
      ssh ${!COMPUTEIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
      ssh ${!COMPUTEIP} "ps -ef | grep stack.sh"
@@@ -880,6 -1210,7 +925,6 @@@ while [ ${in_progress} -eq 1 ]; d
              continue
          elif [ "$stacking_status" == "Stacking Failed" ]; then
              echo "node $index ${os_node_list[index]}: stacking has failed"
 -            collect_logs
              exit 1
          elif [ "$stacking_status" == "Stacking Complete" ]; then
              echo "node $index ${os_node_list[index]}: stacking complete"
      sleep 60
      if [ ${iteration} -eq 60 ]; then
          echo "stacking has failed - took longer than 60m"
 -        collect_logs
          exit 1
      fi
  done
@@@ -924,9 -1256,17 +969,9 @@@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`
      num_hypervisors=$(${SSH} ${!CONTROLIP} "cd /opt/stack/devstack; source openrc admin admin; openstack hypervisor list -f value | wc -l" | tail -1 | tr -d "\r")
      if ! [ "${num_hypervisors}" ] || ! [ ${num_hypervisors} -eq ${expected_num_hypervisors} ]; then
          echo "Error: Only $num_hypervisors hypervisors detected, expected $expected_num_hypervisors"
 -        collect_logs
          exit 1
      fi
  
 -    # upgrading pip, urllib3 and httplib2 so that tempest tests can be run on openstack control node
 -    # this needs to happen after devstack runs because it seems devstack is pulling in specific versions
 -    # of these libs that are not working for tempest.
 -    ${SSH} ${!CONTROLIP} "sudo pip install --upgrade pip"
 -    ${SSH} ${!CONTROLIP} "sudo pip install urllib3 --upgrade"
 -    ${SSH} ${!CONTROLIP} "sudo pip install httplib2 --upgrade"
 -
      # Gather Compute IPs for the site
      for j in `seq 1 ${NUM_COMPUTES_PER_SITE}`; do
          COMPUTE_INDEX=$(((i-1) * NUM_COMPUTES_PER_SITE + j))
@@@ -1108,13 -1448,11 +1153,13 @@@ for suite in ${SUITES}; d
      -v CONTROLLERFEATURES:"${CONTROLLERFEATURES}" \
      -v CONTROLLER_USER:${USER} \
      -v DEVSTACK_DEPLOY_PATH:/opt/stack/devstack \
 +    -v ENABLE_ITM_DIRECT_TUNNELS:${ENABLE_ITM_DIRECT_TUNNELS} \
      -v HA_PROXY_IP:${HA_PROXY_IP} \
      -v HA_PROXY_1_IP:${HA_PROXY_1_IP} \
      -v HA_PROXY_2_IP:${HA_PROXY_2_IP} \
      -v HA_PROXY_3_IP:${HA_PROXY_3_IP} \
      -v JDKVERSION:${JDKVERSION} \
 +    -v JENKINS_WORKSPACE:${WORKSPACE} \
      -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
      -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \
      -v NUM_OPENSTACK_SITES:${NUM_OPENSTACK_SITES} \
      -v OS_COMPUTE_4_IP:${OPENSTACK_COMPUTE_NODE_4_IP} \
      -v OS_COMPUTE_5_IP:${OPENSTACK_COMPUTE_NODE_5_IP} \
      -v OS_COMPUTE_6_IP:${OPENSTACK_COMPUTE_NODE_6_IP} \
+     -v CMP_INSTANCES_SHARED_PATH:/var/instances \
      -v OS_USER:${USER} \
      -v PUBLIC_PHYSICAL_NETWORK:${PUBLIC_PHYSICAL_NETWORK} \
      -v SECURITY_GROUP_MODE:${SECURITY_GROUP_MODE} \
@@@ -1162,6 -1501,7 +1208,6 @@@ ssh ${ODL_SYSTEM_IP} "ls -altr /tmp/${B
  ssh ${ODL_SYSTEM_IP} "du -hs /tmp/${BUNDLEFOLDER}/data/log/*"
  
  echo "Tests Executed"
 -collect_logs
  
  true  # perhaps Jenkins is testing last exit code
  # vim: ts=4 sw=4 sts=4 et ft=sh :