Do not use loopback type of LVM setup in case of IPMI provisionning.
This commit is contained in:
parent
49429ae735
commit
9f2f5673fd
|
@ -17,6 +17,23 @@ else
|
|||
IMAGE_PASS="cubswin:)"
|
||||
fi
|
||||
|
||||
# Default value for parameters:
|
||||
|
||||
# Possible values: loopback, presetup
|
||||
LVMTYPE=loopback
|
||||
|
||||
for i in $@ ; do
|
||||
case "${1}" in
|
||||
"--lvmtype")
|
||||
if [ -z "${2}" ] ; then echo "Parameter for option --lvmtype is missing" > /dev/stderr ; DO_EXIT="yes" ; fi
|
||||
LVMTYPE="${2}"
|
||||
shift
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
done
|
||||
|
||||
if [ -n "${1}" ] ; then
|
||||
DEBIAN_REPO_PARAM=" -u ${1} -s ${1}"
|
||||
shift
|
||||
|
@ -292,6 +309,8 @@ create_non_admin_keystone_user
|
|||
build_and_upload_image
|
||||
fix_tempest_config
|
||||
gen_ssh_root_key
|
||||
setup_loopback_based_lvm_vg
|
||||
if [ "${LVMTYPE}" = "loopback" ] ; then
|
||||
setup_loopback_based_lvm_vg
|
||||
fi
|
||||
setup_loopback_based_swift
|
||||
install_cinder
|
||||
|
|
|
@ -192,7 +192,16 @@ otci_install_openstack_deploy () {
|
|||
echo "===> Running openstack-deploy-proxy-network"
|
||||
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"
|
||||
otci_remote "sudo openstack-deploy-tempest ${OTCI_DEBIAN_REPO_URL}"
|
||||
if ! [ "${OTCI_VIRT_MODE}" = "ipmi" ] ; then
|
||||
LVMTYPE=presetup
|
||||
else
|
||||
LVMTYPE=loopback
|
||||
fi
|
||||
otci_remote "sudo openstack-deploy-tempest --lvmtype presetup ${OTCI_DEBIAN_REPO_URL}"
|
||||
}
|
||||
|
||||
otci_add_ovs_ip () {
|
||||
otci_remote "ifconfig eth1:0 ${OTCI_LOCAL_IP} netmask 255.255.255.0 up"
|
||||
}
|
||||
|
||||
otci_run_tempest () {
|
||||
|
@ -204,6 +213,8 @@ otci_wait_for_ssh
|
|||
otci_aptget_update
|
||||
if ! [ "${OTCI_VIRT_MODE}" = "ipmi" ] ; then
|
||||
otci_add_source_list
|
||||
else
|
||||
otci_add_ovs_ip
|
||||
fi
|
||||
otci_install_openstack_deploy
|
||||
otci_run_tempest
|
||||
|
|
Loading…
Reference in New Issue