Fix discovery ramdisk build with RHOS
Don't build with delorean-rdo-management in the discovery ramdisk if RHOS=1 Change-Id: I2d6d920124c270a54d87807ba3bd435e0806974f
This commit is contained in:
parent
7e51106c52
commit
60eebd0095
@ -86,7 +86,11 @@ export DEPLOY_IMAGE_ELEMENT=${DEPLOY_IMAGE_ELEMENT:-deploy-ironic}
|
|||||||
export DEPLOY_NAME=${DEPLOY_NAME:-deploy-ramdisk-ironic}
|
export DEPLOY_NAME=${DEPLOY_NAME:-deploy-ramdisk-ironic}
|
||||||
# Include delorean-rdo-management with the discovery ramdisk build so that we
|
# Include delorean-rdo-management with the discovery ramdisk build so that we
|
||||||
# can install python-hardware from somewhere.
|
# can install python-hardware from somewhere.
|
||||||
export DISCOVERY_IMAGE_ELEMENT=${DISCOVERY_IMAGE_ELEMENT:-"delorean-rdo-management ironic-discoverd-ramdisk-instack"}
|
if [ "${RHOS:-0}" = "0" ]; then
|
||||||
|
export DISCOVERY_IMAGE_ELEMENT=${DISCOVERY_IMAGE_ELEMENT:-"delorean-rdo-management ironic-discoverd-ramdisk-instack"}
|
||||||
|
else
|
||||||
|
export DISCOVERY_IMAGE_ELEMENT=${DISCOVERY_IMAGE_ELEMENT:-"ironic-discoverd-ramdisk-instack"}
|
||||||
|
fi
|
||||||
export DISCOVERY_NAME=${DISCOVERY_NAME:-discovery-ramdisk}
|
export DISCOVERY_NAME=${DISCOVERY_NAME:-discovery-ramdisk}
|
||||||
|
|
||||||
export DIB_COMMON_ELEMENTS=${DIB_COMMON_ELEMENTS:-""}
|
export DIB_COMMON_ELEMENTS=${DIB_COMMON_ELEMENTS:-""}
|
||||||
|
Loading…
Reference in New Issue
Block a user