x
/
os-xenapi
Code Issues Proposed changes

Move image configuration from devstack to os-xenapi. 

Use override-defaults to override the upstream default variables.

Change-Id: I0e110bece77b7e4e99e75810680882cfe8344948
This commit is contained in:
Jianghua Wang 2017-02-17 19:44:44 +08:00
parent 7aee2d3eaa
commit daf2dfc7c7
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/override-defaults Normal file
View File

@ -0,0 +1,2 @@
export CIRROS_VERSION="0.3.5"
export CIRROS_ARCH="x86_64"

6
devstack/plugin.sh
View File

@ -61,6 +61,11 @@ if [[ "$MODE" == "stack" ]]; then
case "$PHASE" in
install)
install_plugins
# set image variables
DEFAULT_IMAGE_NAME="cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk"
DEFAULT_IMAGE_FILE_NAME="cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.vhd.tgz"
IMAGE_URLS="http://ca.downloads.xensource.com/OpenStack/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.vhd.tgz"
IMAGE_URLS+=",http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz"
;;
post-config)
# Called after the layer 1 and 2 services have been configured.
@ -77,6 +82,7 @@ if [[ "$MODE" == "stack" ]]; then
# or any other test environments
iniset $TEMPEST_CONFIG compute hypervisor_type XenServer
iniset $TEMPEST_CONFIG compute volume_device_name xvdb
iniset $TEMPEST_CONFIG scenario img_file $DEFAULT_IMAGE_FILE_NAME
# TODO(huanxie) Maybe we can set some conf here for CI?
;;
esac