From d5931adedb74ad51dff9a6ec4e6dcb06319efd98 Mon Sep 17 00:00:00 2001 From: Ghanshyam Date: Tue, 27 Jun 2023 04:14:12 +0000 Subject: [PATCH] Revert "Fix IRONIC_IMAGE_NAME=non-existent-image" This reverts commit 2f8ee2cf40b594e3da10f883b453bd81bad6d0ab. Reason for revert: Tempest removed the setting of DEFAULT_IMAGE_NAME to 'non-existent-image', that should fix the issue - https://review.opendev.org/c/openstack/tempest/+/886796/2 Change-Id: I4767518b3306a8c4da08d1f0650d78ef8d78ca9c --- devstack/common_settings | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/devstack/common_settings b/devstack/common_settings index a6eac65932..8d5660c4df 100644 --- a/devstack/common_settings +++ b/devstack/common_settings @@ -16,9 +16,7 @@ CIRROS_VERSION=${CIRROS_VERSION:-$CIRROS_VERSION_DEVSTACK} IRONIC_DEFAULT_IMAGE_NAME=cirros-${CIRROS_VERSION}-x86_64-uec -# TODO (iurygregory): change to the normal order after the discussion -# with openstack-qa https://review.opendev.org/c/openstack/tempest/+/831018 -IRONIC_IMAGE_NAME=${IRONIC_DEFAULT_IMAGE_NAME:-$DEFAULT_IMAGE_NAME} +IRONIC_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-$IRONIC_DEFAULT_IMAGE_NAME} # Add link to download queue, ignore if already exist. # TODO(vsaienko) Move to devstack https://review.opendev.org/420656