diff options
author | Vasyl Saienko <vsaienko@mirantis.com> | 2017-01-20 16:26:04 +0000 |
---|---|---|
committer | Vasyl Saienko <vsaienko@mirantis.com> | 2017-03-15 16:54:45 +0200 |
commit | e48375538c11a988e66fd9eadc944e82cb7f4b57 (patch) | |
tree | f63a9062bec9ccfd6724e930373a7b5cd59452be /devstack | |
parent | 632f082b2cde5626e19aa8380ba4c69ee44bc866 (diff) | |
download | ironic-e48375538c11a988e66fd9eadc944e82cb7f4b57.tar.gz |
Add Ironic standalone tests
This patch adds the following standalone tests:
* agent_ipmitool + wholedisk image + bios
* agent_ipmitool + partitioned image + bios
* pxe_ipmitool + wholedisk image + bios
* pxe_ipmitool + partitioned image + bios
Partial-Bug: #1660606
Change-Id: Ic04b0f134e20d9937a610a14d7c4128f45738eeb
Diffstat (limited to 'devstack')
-rw-r--r-- | devstack/files/debs/ironic | 1 | ||||
-rw-r--r-- | devstack/files/rpms/ironic | 1 | ||||
-rw-r--r-- | devstack/lib/ironic | 25 |
3 files changed, 24 insertions, 3 deletions
diff --git a/devstack/files/debs/ironic b/devstack/files/debs/ironic index 141b75ff7..8bb5deaa8 100644 --- a/devstack/files/debs/ironic +++ b/devstack/files/debs/ironic @@ -17,6 +17,7 @@ iptables ipxe gnupg libguestfs0 +libguestfs-tools libvirt-bin open-iscsi openssh-client diff --git a/devstack/files/rpms/ironic b/devstack/files/rpms/ironic index ed66746d0..ac22dd4e9 100644 --- a/devstack/files/rpms/ironic +++ b/devstack/files/rpms/ironic @@ -4,6 +4,7 @@ iptables ipxe-bootimgs gnupg libguestfs +libguestfs-tools libvirt libvirt-python net-tools diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 11754d4d1..2dc1e9992 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -567,10 +567,14 @@ else add_image_link http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-disk.img fi + +IRONIC_WHOLEDISK_IMAGE_NAME=${IRONIC_WHOLEDISK_IMAGE_NAME:-${IRONIC_IMAGE_NAME/-uec/-disk}} +IRONIC_PARTITIONED_IMAGE_NAME=${IRONIC_PARTITIONED_IMAGE_NAME:-${IRONIC_IMAGE_NAME/-disk/-uec}} + if [[ "$IRONIC_TEMPEST_WHOLE_DISK_IMAGE" == "True" ]]; then - IRONIC_IMAGE_NAME=${IRONIC_IMAGE_NAME/-uec/-disk} + IRONIC_IMAGE_NAME=$IRONIC_WHOLEDISK_IMAGE_NAME else - IRONIC_IMAGE_NAME=${IRONIC_IMAGE_NAME/-disk/-uec} + IRONIC_IMAGE_NAME=$IRONIC_PARTITIONED_IMAGE_NAME fi # NOTE(vsaienko) set DEFAULT_IMAGE_NAME here, as it is still used by grenade @@ -656,7 +660,7 @@ function install_ironic { if [[ "$HOST_TOPOLOGY_ROLE" != "subnode" ]]; then # make sure all needed service were enabled local req_services="key" - if [[ "$VIRT_DRIVER" == "ironic" ]]; then + if is_service_enabled nova && [[ "$VIRT_DRIVER" == "ironic" ]]; then req_services+=" nova glance neutron" fi for srv in $req_services; do @@ -1996,6 +2000,21 @@ function ironic_configure_tempest { iniset $TEMPEST_CONFIG compute image_ref $image_uuid iniset $TEMPEST_CONFIG compute image_ref_alt $image_uuid + image_uuid=$(openstack image show $IRONIC_WHOLEDISK_IMAGE_NAME -f value -c id) + iniset $TEMPEST_CONFIG baremetal whole_disk_image_ref $image_uuid + image_uuid=$(openstack image show $IRONIC_PARTITIONED_IMAGE_NAME -f value -c id) + iniset $TEMPEST_CONFIG baremetal partition_image_ref $image_uuid + iniset $TEMPEST_CONFIG baremetal enabled_drivers $IRONIC_ENABLED_DRIVERS + iniset $TEMPEST_CONFIG baremetal enabled_hardware_types $IRONIC_ENABLED_HARDWARE_TYPES + + local adjusted_root_disk_size_gb + if [[ "$IRONIC_IS_HARDWARE" == "False" ]]; then + adjusted_root_disk_size_gb=$(( ${IRONIC_VM_SPECS_DISK} - ${IRONIC_VM_EPHEMERAL_DISK} )) + else + adjusted_root_disk_size_gb=$(( ${IRONIC_HW_NODE_DISK} - ${IRONIC_HW_EPHEMERAL_DISK} )) + fi + iniset $TEMPEST_CONFIG baremetal adjusted_root_disk_size_gb $adjusted_root_disk_size_gb + if [[ -n "${IRONIC_TEMPEST_BUILD_TIMEOUT}" ]]; then iniset $TEMPEST_CONFIG baremetal unprovision_timeout $IRONIC_TEMPEST_BUILD_TIMEOUT iniset $TEMPEST_CONFIG baremetal active_timeout $IRONIC_TEMPEST_BUILD_TIMEOUT |