openstack
/
deb-openstack-meta-packages
Code Issues Proposed changes

Added --otci-lvm-device and fixed better param to openstack-deploy-tempest

This commit is contained in:
Thomas Goirand 2016-03-11 22:40:36 +01:00
parent 9f2f5673fd
commit 27ee244428
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/openstack-deploy-tempest
View File

@ -22,21 +22,41 @@ fi
# Possible values: loopback, presetup
LVMTYPE=loopback
# Device on which we should setup LVM for Cinder use
OTCI_LVM_DEVICE=sda
# URL of the Debian repo to use to create the Debian
# openstack VM image (only useful if the above TEST_IMAGE_TYPE
# is set to debian).
DEBIAN_REPO_PARAM=" -u http://http.debian.net/debian -s http://http.debian.net/debian"
for i in $@ ; do
case "${1}" in
"--lvmtype")
"--otci-lvmtype")
if [ -z "${2}" ] ; then echo "Parameter for option --lvmtype is missing" > /dev/stderr ; DO_EXIT="yes" ; fi
LVMTYPE="${2}"
shift
shift
;;
"--otci-lvm-device")
if [ -z "${2}" ] ; then echo "Parameter for option --lvmtype is missing" > /dev/stderr ; DO_EXIT="yes" ; fi
OTCI_LVM_DEVICE="${2}"
shift
shift
;;
"--otci-openstack-debian-images-deb-repo")
if [ -z "${2}" ] ; then echo "Parameter for option --otci-openstack-debian-images-deb-repo is missing" > /dev/stderr ; DO_EXIT="yes" ; fi
DEBIAN_REPO_PARAM=" -u ${2} -s ${2}"
shift
shift
;;
*)
;;
done
if [ -n "${1}" ] ; then
DEBIAN_REPO_PARAM=" -u ${1} -s ${1}"
shift
if [ ${DO_EXIT} = "yes" ] ; then
echo "Parameters not validated: will exit now!" > /dev/stderr
exit 1
fi
####################

4
src/openstack-tempest-ci
View File

@ -193,11 +193,11 @@ otci_install_openstack_deploy () {
otci_remote "sudo openstack-deploy-proxy-network --mgmt-ip-cidr ${OTCI_ETH1_CIDR} --mgmt-if eth1 --ext-host-min ${OTCI_PUBIP_START} --ext-host-max ${OTCI_PUBIP_END} --local-ip ${OTCI_LOCAL_IP}"
echo "===> Deploying tempest"
if ! [ "${OTCI_VIRT_MODE}" = "ipmi" ] ; then
LVMTYPE=presetup
LVMTYPE="resetup --otci-lvm-device sda"
else
LVMTYPE=loopback
fi
otci_remote "sudo openstack-deploy-tempest --lvmtype presetup ${OTCI_DEBIAN_REPO_URL}"
otci_remote "sudo openstack-deploy-tempest --otci-lvmtype ${LVMTYPE} --otci-openstack-debian-images-deb-repo ${OTCI_DEBIAN_REPO_URL}"
}
otci_add_ovs_ip () {