openstack
/
tripleo-ci
Code Issues Proposed changes

Add the (now missing) DHCP_DRIVER. 

We now need to manually specify the DHCP_DRIVER for toci to use
for the seed VM and undercloud.

Change-Id: I523cc7176f9da4290226b96e06e2a5c13cdd338c
This commit is contained in:
Dan Prince 2013-09-25 09:19:21 -04:00
parent 15b5c487c2
commit ff3a52b1fb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toci-defaults
View File

@ -27,6 +27,8 @@ fi
# This gets passed into diskimage builder
export NODE_DIST=${NODE_DIST:-'pip-cache fedora selinux-permissive'}
export DHCP_DRIVER=${DHCP_DRIVER:-'bm-dnsmasq'}
# Set to 0 if you don't want an overcloud to be started
export TOCI_DO_OVERCLOUD=${TOCI_DO_OVERCLOUD:-1}

4
toci_setup.sh
View File

@ -39,9 +39,9 @@ $TOCI_WORKING_DIR/diskimage-builder/bin/ramdisk-image-create -x -a $TOCI_DIB_ARC
# Boot a seed vm
$TOCI_WORKING_DIR/tripleo-incubator/scripts/boot-seed-vm -a $TOCI_DIB_ARCH $NODE_DIST
$TOCI_WORKING_DIR/tripleo-incubator/scripts/boot-seed-vm -a $TOCI_DIB_ARCH $NODE_DIST $DHCP_DRIVER
# Make the tripleo image elements accessible to diskimage-builder
export ELEMENTS_PATH=$TOCI_WORKING_DIR/diskimage-builder/elements:$TOCI_WORKING_DIR/tripleo-image-elements/elements
$TOCI_WORKING_DIR/diskimage-builder/bin/disk-image-create $NODE_DIST -a $TOCI_DIB_ARCH -o $TOCI_WORKING_DIR/undercloud boot-stack nova-baremetal os-collect-config stackuser local-config
$TOCI_WORKING_DIR/diskimage-builder/bin/disk-image-create $NODE_DIST -a $TOCI_DIB_ARCH -o $TOCI_WORKING_DIR/undercloud boot-stack nova-baremetal os-collect-config stackuser local-config $DHCP_DRIVER