openstack
/
tripleo-ci
Code Issues Proposed changes

Updates passing of HW params to scripts 

tripleo-incubator scripts now pass cpu, memory, disk, architecture
as params to create-nodes and setup-baremetal scripts. This patch
reflects the change on toci side.

Change-Id: Ib0277349dd9ef448bdf303b9a1a2cea6caad48f6
This commit is contained in:
Jan Provaznik 2013-09-09 13:24:25 +02:00
parent 9b2a45b8e3
commit 6dfdc0db6c
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FAQ.md
View File

@ -19,10 +19,10 @@ A. $ ssh heat-admin@192.0.2.2
**Q. How can I create more bm_poseur nodes and add them to my undercloud**
$ . undercloudrc
# <cpus> <memory> <disk> <quantity>
$ create-nodes 1 1024 10 5
# <cpus> <memory> <disk> <architecture> <quantity>
$ create-nodes 1 1024 10 i386 5
$ export MACS=$($TOCI_WORKING_DIR/bm_poseur/bm_poseur get-macs)
$ setup-baremetal 1 768 10 all
$ setup-baremetal 1 768 10 i386 all
**Q. How can I create a new image, using the elements fedora, selinux-permissive and stackuser**

2
patches/tripleo-incubator-0001-no-virsh-prealloc-metadata.patch
View File

@ -17,7 +17,7 @@ index cb3d94c..0bedb5b 100755
# TODO: make this idempotent / at least not error when run more than once.
- virsh vol-create-as default baremetal-$count.qcow2 ${DISK}G --format qcow2 --prealloc-metadata
+ virsh vol-create-as default baremetal-$count.qcow2 ${DISK}G --format qcow2 #--prealloc-metadata
configure-vm --bootdev network --name baremetal_$count --image /var/lib/libvirt/images/baremetal-$count.qcow2 --arch i686 --cpus $CPU --memory $MEM
configure-vm --bootdev network --name baremetal_$count --image /var/lib/libvirt/images/baremetal-$count.qcow2 --arch $ARCH --cpus $CPU --memory $MEM
done
--
1.8.1.4

7
toci-defaults
View File

@ -49,7 +49,6 @@ export TOCI_UPLOAD=${TOCI_UPLOAD:-0}
export TOCI_IRC
# bm_poser host resources, use by various scripts
export NODE_CPU=${TOCI_NODE_CPU:-1} # Number of cpu's
export NODE_MEM=${TOCI_NODE_MEM:-1024} # RAM MB
export NODE_DISK=${TOCI_NODE_DISK:-30} # Disk size
export NODE_ARCH=$TOCI_DIB_ARCH # arch i386/amd64
export TOCI_NODE_CPU=${TOCI_NODE_CPU:-1} # Number of cpu's
export TOCI_NODE_MEM=${TOCI_NODE_MEM:-1024} # RAM MB
export TOCI_NODE_DISK=${TOCI_NODE_DISK:-30} # Disk size

10
toci_test.sh
View File

@ -31,20 +31,20 @@ user-config #Adds nova keypair
if [ -n "$TOCI_MACS" ]; then
# call setup-baremetal with no macs so baremetal flavor is created
MACS= setup-baremetal 1 1024 30 seed
MACS= setup-baremetal $TOCI_NODE_CPU $TOCI_NODE_MEM $TOCI_NODE_DISK $TOCI_DIB_ARCH seed
MACS=( $TOCI_MACS )
IPS=( $TOCI_PM_IPS )
USERS=( $TOCI_PM_USERS )
PASSWORDS=( $TOCI_PM_PASSWORDS )
COUNT=0
for MAC in "${MACS[@]}"; do
nova baremetal-node-create --pm_address=${IPS[$COUNT]} --pm_user=${USERS[$COUNT]} --pm_password=${PASSWORDS[$COUNT]} ubuntu 1 1024 30 $MAC
nova baremetal-node-create --pm_address=${IPS[$COUNT]} --pm_user=${USERS[$COUNT]} --pm_password=${PASSWORDS[$COUNT]} ubuntu $TOCI_NODE_CPU $TOCI_NODE_MEM $TOCI_NODE_DISK $MAC
COUNT=$(( $COUNT + 1 ))
done
else
create-nodes 5
create-nodes $TOCI_NODE_CPU $TOCI_NODE_MEM $TOCI_NODE_DISK $TOCI_DIB_ARCH 5
export MACS=$($TOCI_WORKING_DIR/bm_poseur/bm_poseur get-macs)
setup-baremetal seed
setup-baremetal $TOCI_NODE_CPU $TOCI_NODE_MEM $TOCI_NODE_DISK $TOCI_DIB_ARCH seed
fi
setup-neutron 192.0.2.2 192.0.2.3 192.0.2.0/24 192.0.2.1 ctlplane
@ -119,7 +119,7 @@ if [ "$TOCI_DO_OVERCLOUD" != "1" ] ; then
fi
user-config
setup-baremetal undercloud
setup-baremetal $TOCI_NODE_CPU $TOCI_NODE_MEM $TOCI_NODE_DISK $TOCI_DIB_ARCH undercloud
setup-neutron 192.0.2.5 192.0.2.24 192.0.2.0/24 $UNDERCLOUD_IP ctlplane
ssh_noprompt heat-admin@$UNDERCLOUD_IP "cat /opt/stack/boot-stack/virtual-power-key.pub" >> ~/.ssh/authorized_keys