From 7ff1e0bc2193acd009a74db81cf8e8cc8639ad12 Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 24 Jan 2018 11:28:19 -0500
Subject: [PATCH] qa/workunits/rbd: switch devstack to pike release

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---
 qa/workunits/rbd/run_devstack_tempest.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/qa/workunits/rbd/run_devstack_tempest.sh b/qa/workunits/rbd/run_devstack_tempest.sh
index 0cb7f72521d68..b899e909d8ad5 100755
--- a/qa/workunits/rbd/run_devstack_tempest.sh
+++ b/qa/workunits/rbd/run_devstack_tempest.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -ex
 
-STACK_BRANCH=stable/ocata
+STACK_BRANCH=stable/pike
 
 STACK_USER=${STACK_USER:-stack}
 STACK_GROUP=${STACK_GROUP:-stack}
@@ -34,6 +34,10 @@ trap cleanup INT TERM EXIT
 # devstack configuration adapted from upstream gate
 cat<<EOF > ${STACK_HOME_PATH}/local.conf
 [[local|localrc]]
+ENABLE_CEPH_CINDER=True
+ENABLE_CEPH_GLANCE=True
+ENABLE_CEPH_C_BAK=True
+ENABLE_CEPH_NOVA=True
 Q_USE_DEBUG_COMMAND=True
 NETWORK_GATEWAY=10.1.0.1
 USE_SCREEN=False
@@ -51,7 +55,7 @@ SERVICE_TOKEN=111222333444
 SWIFT_HASH=1234123412341234
 ROOTSLEEP=0
 NOVNC_FROM_PACKAGE=True
-ENABLED_SERVICES=c-api,c-bak,c-sch,c-vol,ceilometer-acentral,ceilometer-acompute,ceilometer-alarm-evaluator,ceilometer-alarm-notifier,ceilometer-anotification,ceilometer-api,ceilometer-collector,cinder,dstat,g-api,g-reg,horizon,key,mysql,n-api,n-cauth,n-cond,n-cpu,n-novnc,n-obj,n-sch,peakmem_tracker,placement-api,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy,tempest
+ENABLED_SERVICES=c-api,c-bak,c-sch,c-vol,ceilometer-acentral,ceilometer-acompute,ceilometer-alarm-evaluator,ceilometer-alarm-notifier,ceilometer-anotification,ceilometer-api,ceilometer-collector,cinder,dstat,etcd3,g-api,g-reg,key,mysql,n-api,n-api-meta,n-cauth,n-cond,n-cpu,n-novnc,n-obj,n-sch,peakmem_tracker,placement-api,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy,tempest
 SKIP_EXERCISES=boot_from_volume,bundle,client-env,euca
 SYSLOG=False
 SCREEN_LOGDIR=${STACK_LOG_PATH}/screen-logs
@@ -64,17 +68,15 @@ PUBLIC_NETWORK_GATEWAY=172.24.5.1
 FIXED_NETWORK_SIZE=4096
 VIRT_DRIVER=libvirt
 SWIFT_REPLICAS=1
+SWIFT_START_ALL_SERVICES=False
 LOG_COLOR=False
 UNDO_REQUIREMENTS=False
 CINDER_PERIODIC_INTERVAL=10
 
 export OS_NO_CACHE=True
-OS_NO_CACHE=True
-CEILOMETER_BACKEND=mysql
 LIBS_FROM_GIT=
-DATABASE_QUERY_LOGGING=True
 EBTABLES_RACE_FIX=True
-CINDER_SECURE_DELETE=False
+DEBUG_LIBVIRT_COREDUMPS=False
 CINDER_VOLUME_CLEAR=none
 LIBVIRT_TYPE=kvm
 VOLUME_BACKING_FILE_SIZE=24G
@@ -84,6 +86,8 @@ FORCE_CONFIG_DRIVE=False
 CINDER_ENABLED_BACKENDS=ceph:ceph
 TEMPEST_STORAGE_PROTOCOL=ceph
 REMOTE_CEPH=True
+
+enable_plugin devstack-plugin-mariadb git://github.com/openstack/devstack-plugin-mariadb
 enable_plugin devstack-plugin-ceph git://git.openstack.org/openstack/devstack-plugin-ceph
 EOF
 
@@ -101,7 +105,7 @@ cd devstack
 cp ${STACK_HOME_PATH}/local.conf .
 
 export PYTHONUNBUFFERED=true
-export PROJECTS="openstack/devstack-plugin-ceph"
+export PROJECTS="openstack/devstack-plugin-ceph openstack/devstack-plugin-mariadb"
 
 ./stack.sh
 EOF
-- 
2.39.5