diff options
| author | Amrith Kumar <amrith@tesora.com> | 2016-10-09 07:13:29 -0400 |
|---|---|---|
| committer | Amrith Kumar <amrith@tesora.com> | 2016-10-09 07:14:25 -0400 |
| commit | b120be1772f2416730ea1066782bf0813ca2dd1a (patch) | |
| tree | e86dddeed295fdb97489f66170d6965a58474cd9 /integration/scripts/conf/redis.conf | |
| parent | 473d360b906dba80f0f914e88b461221c1bfd5f3 (diff) | |
| download | trove-b120be1772f2416730ea1066782bf0813ca2dd1a.tar.gz | |
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
Diffstat (limited to 'integration/scripts/conf/redis.conf')
| -rw-r--r-- | integration/scripts/conf/redis.conf | 6 |
1 files changed, 6 insertions, 0 deletions
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, |