Merge "CI: move libvirt images to /opt for standalone and multinode jobs"

devstack/lib/ironic

@@ -360,6 +360,9 @@ IRONIC_CONFIGURE_GLANCE_WITH_SWIFT=$(trueorfalse False IRONIC_CONFIGURE_GLANCE_W
 # The path to the libvirt hooks directory, used if IRONIC_VM_LOG_ROTATE is True
 IRONIC_LIBVIRT_HOOKS_PATH=${IRONIC_LIBVIRT_HOOKS_PATH:-/etc/libvirt/hooks/}
 
+LIBVIRT_STORAGE_POOL=${LIBVIRT_STORAGE_POOL:-"default"}
+LIBVIRT_STORAGE_POOL_PATH=${LIBVIRT_STORAGE_POOL_PATH:-/var/lib/libvirt/images}
+
 # The authentication strategy used by ironic-api. Valid values are:
 # keystone and noauth.
 IRONIC_AUTH_STRATEGY=${IRONIC_AUTH_STRATEGY:-keystone}
@@ -1769,6 +1772,22 @@ an ANSI escape sequence.
 EOF
 }
 
+function initialize_libvirt_storage_pool {
+    [ -d $LIBVIRT_STORAGE_POOL_PATH ] || sudo mkdir -p $LIBVIRT_STORAGE_POOL_PATH
+
+    if ! sudo virsh pool-list --all | grep -q $LIBVIRT_STORAGE_POOL; then
+        sudo virsh pool-define-as --name $LIBVIRT_STORAGE_POOL dir \
+            --target $LIBVIRT_STORAGE_POOL_PATH >&2
+        sudo virsh pool-autostart $LIBVIRT_STORAGE_POOL >&2
+        sudo virsh pool-start $LIBVIRT_STORAGE_POOL >&2
+    fi
+
+    pool_state=$(sudo virsh pool-info $LIBVIRT_STORAGE_POOL | grep State | awk '{ print $2 }')
+    if [ "$pool_state" != "running" ] ; then
+        sudo virsh pool-start $LIBVIRT_STORAGE_POOL >&2
+    fi
+}
+
 function create_bridge_and_vms {
     # Call libvirt setup scripts in a new shell to ensure any new group membership
     sudo su $STACK_USER -c "$IRONIC_SCRIPTS_DIR/setup-network.sh $IRONIC_VM_NETWORK_BRIDGE $PUBLIC_BRIDGE_MTU"
@@ -1802,6 +1821,8 @@ function create_bridge_and_vms {
         vm_opts+=" -D virtio"
     fi
 
+    initialize_libvirt_storage_pool
+
     local bridge_mac
     bridge_mac=$(ip link show dev $IRONIC_VM_NETWORK_BRIDGE | grep -Eo "ether [A-Za-z0-9:]+"|sed "s/ether\ //")
 
@@ -1812,7 +1833,7 @@ function create_bridge_and_vms {
                 -c $IRONIC_VM_SPECS_CPU -m $IRONIC_VM_SPECS_RAM -d $IRONIC_VM_SPECS_DISK \
                 -a $IRONIC_VM_SPECS_CPU_ARCH -b $IRONIC_VM_NETWORK_BRIDGE $vm_opts -p $vbmc_port -o $pdu_outlet \
                 -i $IRONIC_VM_INTERFACE_COUNT -f $IRONIC_VM_SPECS_DISK_FORMAT -M $PUBLIC_BRIDGE_MTU $log_arg \
-                -v $IRONIC_VM_VOLUME_COUNT >> $IRONIC_VM_MACS_CSV_FILE
+                -v $IRONIC_VM_VOLUME_COUNT -P $LIBVIRT_STORAGE_POOL >> $IRONIC_VM_MACS_CSV_FILE
 SUBSHELL
 
         if is_deployed_by_ipmi; then

devstack/tools/ironic/scripts/create-node.sh

@@ -12,7 +12,7 @@ export PS4='+ ${BASH_SOURCE:-}:${FUNCNAME[0]:-}:L${LINENO:-}:   '
 # Keep track of the DevStack directory
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 
-while getopts "n:c:i:m:M:d:a:b:e:E:p:o:f:l:L:N:A:D:v:" arg; do
+while getopts "n:c:i:m:M:d:a:b:e:E:p:o:f:l:L:N:A:D:v:P:" arg; do
     case $arg in
         n) NAME=$OPTARG;;
         c) CPU=$OPTARG;;
@@ -35,6 +35,7 @@ while getopts "n:c:i:m:M:d:a:b:e:E:p:o:f:l:L:N:A:D:v:" arg; do
         A) MAC_ADDRESS=$OPTARG;;
         D) NIC_DRIVER=$OPTARG;;
         v) VOLUME_COUNT=$OPTARG;;
+        P) STORAGE_POOL=$OPTARG;;
     esac
 done
 
@@ -46,23 +47,11 @@ if [ -z "$UEFI_LOADER" ] && [ ! -z "$UEFI_NVRAM" ]; then
 fi
 
 LIBVIRT_NIC_DRIVER=${NIC_DRIVER:-"e1000"}
-LIBVIRT_STORAGE_POOL=${LIBVIRT_STORAGE_POOL:-"default"}
+LIBVIRT_STORAGE_POOL=${STORAGE_POOL:-"default"}
 LIBVIRT_CONNECT_URI=${LIBVIRT_CONNECT_URI:-"qemu:///system"}
 
 export VIRSH_DEFAULT_CONNECT_URI=$LIBVIRT_CONNECT_URI
 
-if ! virsh pool-list --all | grep -q $LIBVIRT_STORAGE_POOL; then
-    virsh pool-define-as --name $LIBVIRT_STORAGE_POOL dir --target /var/lib/libvirt/images >&2
-    virsh pool-autostart $LIBVIRT_STORAGE_POOL >&2
-    virsh pool-start $LIBVIRT_STORAGE_POOL >&2
-fi
-
-pool_state=$(virsh pool-info $LIBVIRT_STORAGE_POOL | grep State | awk '{ print $2 }')
-if [ "$pool_state" != "running" ] ; then
-    [ ! -d /var/lib/libvirt/images ] && sudo mkdir /var/lib/libvirt/images
-    virsh pool-start $LIBVIRT_STORAGE_POOL >&2
-fi
-
 if [ -n "$LOGDIR" ] ; then
     mkdir -p "$LOGDIR"
 fi

zuul.d/ironic-jobs.yaml

@@ -110,6 +110,10 @@
         IRONIC_RPC_TRANSPORT: json-rpc
         IRONIC_VM_COUNT: 6
         IRONIC_VM_VOLUME_COUNT: 2
+        # We're using a lot of disk space in this job. Some testing nodes have
+        # a small root partition, so use /opt which is mounted from a bigger
+        # ephemeral partition on such nodes
+        LIBVIRT_STORAGE_POOL_PATH: /opt/libvirt/images
         SWIFT_ENABLE_TEMPURLS: True
         SWIFT_TEMPURL_KEY: secretkey
       devstack_services:
@@ -400,6 +404,10 @@
         TEMPEST_PLUGINS: "{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-tempest-plugin"
         TENANT_VLAN_RANGE: 100:150
         VIRT_DRIVER: ironic
+        # We're using a lot of disk space in this job. Some testing nodes have
+        # a small root partition, so use /opt which is mounted from a bigger
+        # ephemeral partition on such nodes
+        LIBVIRT_STORAGE_POOL_PATH: /opt/libvirt/images
       devstack_plugins:
         ironic: https://opendev.org/openstack/ironic
         networking-generic-switch: https://opendev.org/openstack/networking-generic-switch