From b120be1772f2416730ea1066782bf0813ca2dd1a Mon Sep 17 00:00:00 2001 From: Amrith Kumar Date: Sun, 9 Oct 2016 07:13:29 -0400 Subject: Merge trove-integration into trove This commit will merge into trove, the trove-integration tree as of commit 9f92ca853f8aa2f72921e54682c918941a8f0919. This is in preparation for making trove-integration go away. In addition, it supresses any consideration of the integration directory in the trove tox tests as it is understandably a small pile of pooh and in need of much cleanup. Change-Id: Ib7f2655c4c5ed86b5454708c04371ee55e37ec2d Partially-Implements-Blueprint: eliminate-trove-integration-and-redstack --- integration/scripts/conf/redis.conf | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 integration/scripts/conf/redis.conf (limited to 'integration/scripts/conf/redis.conf') diff --git a/integration/scripts/conf/redis.conf b/integration/scripts/conf/redis.conf new file mode 100644 index 00000000..65bd382c --- /dev/null +++ b/integration/scripts/conf/redis.conf @@ -0,0 +1,6 @@ + "instance_flavor_name": "test.tiny-3", + "instance_bigger_flavor_name": "test.tiny-3.resize", + "instance_eph_flavor_name": "test.eph.tiny-3", + "instance_bigger_eph_flavor_name": "test.eph.tiny-3.resize", + "trove_volume_support": true, + "trove_volume_size": 1, -- cgit v1.2.1