summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Stachowski <peter@tesora.com>2016-04-05 15:18:55 +0000
committerPeter Stachowski <peter@tesora.com>2016-04-05 17:42:11 +0000
commitd2b066baf4526e0a23182fa88f78111974c42fca (patch)
tree1bc2db0b2efba78db9a26f416630a18d41fafe6e
parent4cadf13b302fb97fbaed25c6f02f1e826d1b4e3c (diff)
downloadtrove-integration-d2b066baf4526e0a23182fa88f78111974c42fca.tar.gz
Change redstack to use default config values
The plugin code has been enhanced to allow configuration of Trove using variables. The default there is to use the actual config values in the Trove repsoitory. This has been mirrored here, in that the variables are listed so that a user/developer can modify them if they wish, but they do not override the default values anymore. The proper place to add these variables would be in a 'local' options file, such as options.rc or ~/.redstack.options.rc Change-Id: I38bc7190f1c112b4ae3cd6614f1d6cb625b3387d Depends-On: I2c568fdfa05064682f372b996a5aebcdd4e93ef3
-rw-r--r--scripts/redstack.rc21
1 files changed, 12 insertions, 9 deletions
diff --git a/scripts/redstack.rc b/scripts/redstack.rc
index 9681f97..62e500f 100644
--- a/scripts/redstack.rc
+++ b/scripts/redstack.rc
@@ -92,12 +92,15 @@ SWIFT_DISK_IMAGE=${SWIFT_DATA_DIR}/drives/images/swift.img
DISTRO=${DISTRO:-ubuntu}
#DISTRO=fedora
-TROVE_AGENT_CALL_HIGH_TIMEOUT=${TROVE_AGENT_CALL_HIGH_TIMEOUT:-300}
-TROVE_RESIZE_TIME_OUT=${TROVE_RESIZE_TIME_OUT:-900}
-TROVE_USAGE_TIMEOUT=${TROVE_USAGE_TIMEOUT:-1500}
-TROVE_STATE_CHANGE_WAIT_TIME=${TROVE_STATE_CHANGE_WAIT_TIME:-180}
-
-# Set up quota values
-TROVE_MAX_ACCEPTED_VOLUME_SIZE=${TROVE_MAX_ACCEPTED_VOLUME_SIZE:-10}
-TROVE_MAX_INSTANCES_PER_USER=${TROVE_MAX_INSTANCES_PER_USER:-10}
-TROVE_MAX_VOLUMES_PER_USER=${TROVE_MAX_VOLUMES_PER_USER:-10}
+# The following values can be used to tweak how devstack sets
+# up Trove. If not explicitly set, the defaults in the code are used.
+# To make changes without modifying the repo, add these variables
+# to options.rc or ~/redstack.options.rc
+#export TROVE_MAX_ACCEPTED_VOLUME_SIZE=10
+#export TROVE_MAX_INSTANCES_PER_TENANT=10
+#export TROVE_MAX_VOLUMES_PER_TENANT=40
+#export TROVE_AGENT_CALL_LOW_TIMEOUT=15
+#export TROVE_AGENT_CALL_HIGH_TIMEOUT=300
+#export TROVE_RESIZE_TIME_OUT=900
+#export TROVE_USAGE_TIMEOUT=1500
+#export TROVE_STATE_CHANGE_WAIT_TIME=180