@@ -39,6 +39,10 @@ OPENSTACKX_BRANCH=diablo

 QUANTUM_REPO=https://github.com/openstack/quantum

 QUANTUM_BRANCH=stable/diablo

+# CI test suite

+CITEST_REPO=https://github.com/openstack/openstack-integration-tests.git

+CITEST_BRANCH=master

+

 # Specify a comma-separated list of uec images to download and install into glance.

 IMAGE_URLS=http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz

@@ -48,6 +48,8 @@ source ./stackrc

 # Where Openstack code lives

 DEST=${DEST:-/opt/stack}

+DIST_NAME=${DIST_NAME:-natty}

+

 # Process network configuration vars

 GUEST_NETWORK=${GUEST_NETWORK:-1}

 GUEST_RECREATE_NET=${GUEST_RECREATE_NET:-yes}

@@ -78,9 +80,9 @@ GLANCE_PORT=$2

 CONFIG_FILE_TMP=$(mktemp $CONFIG_FILE.XXXXXX)

 cat >$CONFIG_FILE_TMP <<EOF

 [environment]

-aki_location = include/sample_vm/natty-server-cloudimg-amd64-vmlinuz-virtual

-#ari_location = include/sample_vm/natty-server-cloudimg-amd64-loader

-ami_location = include/sample_vm/natty-server-cloudimg-amd64.img

+aki_location = $DEST/openstack-integration-tests/include/sample_vm/$DIST_NAME-server-cloudimg-amd64-vmlinuz-virtual

+#ari_location = $DEST/openstack-integration-tests/include/sample_vm/$DIST_NAME-server-cloudimg-amd64-loader

+ami_location = $DEST/openstack-integration-tests/include/sample_vm/$DIST_NAME-server-cloudimg-amd64.img

 [glance]

 host = $GLANCE_HOST

@@ -102,7 +104,7 @@ port = 8774

 apiver = v1.1

 project = admin

 user = admin

-key = $SERVICE_TOKEN

+key = $ADMIN_PASSWORD

 ssh_timeout = 300

 build_timeout = 300

 flavor_ref = 1