openstack/instack-undercloud
Code Issues Proposed changes

Build the ironic ramdisk

Browse Source
This commit is contained in:
James Slagle 2014-07-31 09:23:19 -04:00
parent b0ea940337
commit 0d0f6012e5
2 changed files with 22 additions and 11 deletions

7
instack-sourcerc

@ -2,7 +2,7 @@
export INSTACK_ROOT=${INSTACK_ROOT:-$(pwd)}
export PATH=$PATH:$INSTACK_ROOT/instack-undercloud:$INSTACK_ROOT/instack-undercloud/scripts
export PATH=$PATH:$INSTACK_ROOT/instack-undercloud:$INSTACK_ROOT/instack-undercloud/scripts:$INSTACK_ROOT/diskimage-builder/bin
export LKG=${LKG:-0}
export RUN_INSTACK=${RUN_INSTACK:-1}
@ -57,6 +57,11 @@ $INSTACK_ROOT/instack-undercloud/elements:\
$INSTACK_ROOT/tripleo-image-elements/elements/:\
$INSTACK_ROOT/diskimage-builder/elements/"
export DEPLOY_IMAGE_ELEMENT=deploy-ironic
export DEPLOY_NAME=deploy-ramdisk-ironic
export DEPLOY_DIB_EXTRA_ARGS=""
export OVERCLOUD_CONTROL_DIB_EXTRA_ARGS="\
baremetal \
base \

26
scripts/instack-build-images

@ -9,19 +9,13 @@ export TMP_DIR=${TMP_DIR:-/var/tmp}
export NODE_ARCH=${NODE_ARCH:-amd64}
export NODE_DIST=${NODE_DIST:-"fedora"}
export DEPLOY_IMAGE_ELEMENT=${DEPLOY_IMAGE_ELEMENT:-deploy}
export DEPLOY_IMAGE_ELEMENT=${DEPLOY_IMAGE_ELEMENT:-deploy-baremetal}
export DEPLOY_NAME=${DEPLOY_NAME:-deploy-ramdisk}
export ELEMENTS_PATH=${ELEMENTS_PATH:-"/usr/share/tripleo-image-elements:/usr/share/instack-undercloud"}
if [ ! -f deploy-ramdisk.initramfs -o \
! -f deploy-ramdisk.kernel ]; then
ramdisk-image-create \
-a $NODE_ARCH \
-o deploy-ramdisk \
$NODE_DIST $DEPLOY_IMAGE_ELEMENT \
undercloud-package-install \
2>&1 | tee dib-deploy.log
fi
export DEPLOY_DIB_EXTRA_ARGS=${DEPLOY_DIB_EXTRA_ARGS:-"\
undercloud-package-install"}
export OVERCLOUD_CONTROL_DIB_EXTRA_ARGS=${OVERCLOUD_CONTROL_DIB_EXTRA_ARGS:-"\
pip-cache boot-stack cinder-api cinder-volume os-collect-config \
@ -86,6 +80,18 @@ os-refresh-config-reboot \
undercloud-package-install \
"}
if [ ! -f $DEPLOY_NAME.initramfs -o \
! -f $DEPLOY_NAME.kernel ]; then
ramdisk-image-create \
-a $NODE_ARCH \
-o $DEPLOY_NAME \
$NODE_DIST $DEPLOY_IMAGE_ELEMENT \
$DEPLOY_DIB_EXTRA_ARGS \
2>&1 | tee dib-deploy.log
fi
exit 0
if [ ! -f overcloud-control.qcow2 ]; then
disk-image-create \
-a $NODE_ARCH \