diff options
| author | Amrith Kumar <amrith@amrith.org> | 2017-03-22 12:21:20 -0400 |
|---|---|---|
| committer | Amrith Kumar <amrith@amrith.org> | 2017-03-23 04:10:06 -0400 |
| commit | c84f5cce1432aa88ad245c5d7623e59d02fec19f (patch) | |
| tree | 41d4ff3be624bd22d6a03d150bcc0053306a7a09 /devstack | |
| parent | 4998becb4da14547798cece21858282761409052 (diff) | |
| download | trove-c84f5cce1432aa88ad245c5d7623e59d02fec19f.tar.gz | |
Improve Gate: address multiple issues relative to timing
This commit merges two commits, 447750[1] and 448630[2] in the fond
hope that this will improve the odds of its being able to merge.
The log operation test assumes that the log will be Ready but in some
cases, Partial is also a valid result. Add that into the list of
allowed results.
In addition, this change aims to support cases where test suites last
much more than 1 hour and where a token can expire unexpectedly mid
operation. This is by no means a 'fix' for the bug here, just a way to
get the gate to be more stable.
[1] https://review.openstack.org/447750
[2] https://review.openstack.org/448630
Change-Id: Ib888dd55f04952139508a7cb0fee60e192e1b77c
Closes-Bug: 1674520
Partial-Fix: 1674510
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/plugin.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 42f6b827..d29d73e3 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -99,6 +99,14 @@ function iniset_conditional { fi } +# configure_keystone_token_life() - update the keystone token life to 3h +function configure_keystone_token_life() { + KEYSTONE_CONF_DIR=${KEYSTONE_CONF_DIR:-/etc/nova} + KEYSTONE_CONF=${KEYSTONE_CONF:-${KEYSTONE_CONF_DIR}/keystone.conf} + KEYSTONE_TOKEN_LIFE=${KEYSTONE_TOKEN_LIFE:-10800} + iniset $KEYSTONE_CONF token expiration ${KEYSTONE_TOKEN_LIFE} + echo "configure_keystone_token_life: setting keystone token life to ${KEYSTONE_TOKEN_LIFE}" +} # configure_nova_kvm() - update the nova hypervisor configuration if possible function configure_nova_kvm { @@ -136,6 +144,7 @@ function configure_trove { setup_develop $TROVE_DIR configure_nova_kvm + configure_keystone_token_life # Create the trove conf dir and cache dirs if they don't exist sudo install -d -o $STACK_USER ${TROVE_CONF_DIR} ${TROVE_AUTH_CACHE_DIR} |