Merge "Use ubuntu image for tempest scenarios from Neutron"
This commit is contained in:
commit
3987159db8
@ -82,6 +82,7 @@ case $VENV in
|
|||||||
load_conf_hook osprofiler
|
load_conf_hook osprofiler
|
||||||
if [[ "$VENV" =~ "dsvm-scenario" ]]; then
|
if [[ "$VENV" =~ "dsvm-scenario" ]]; then
|
||||||
load_conf_hook iptables_verify
|
load_conf_hook iptables_verify
|
||||||
|
load_rc_hook ubuntu_image
|
||||||
fi
|
fi
|
||||||
if [[ "$VENV" =~ "pecan" ]]; then
|
if [[ "$VENV" =~ "pecan" ]]; then
|
||||||
load_conf_hook pecan
|
load_conf_hook pecan
|
||||||
|
5
neutron/tests/contrib/hooks/ubuntu_image
Normal file
5
neutron/tests/contrib/hooks/ubuntu_image
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
DOWNLOAD_DEFAULT_IMAGES=False
|
||||||
|
IMAGE_URLS="http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img,"
|
||||||
|
DEFAULT_INSTANCE_TYPE="ds1G"
|
||||||
|
DEFAULT_INSTANCE_USER="ubuntu"
|
||||||
|
BUILD_TIMEOUT=392
|
Loading…
Reference in New Issue
Block a user