From 3f39e639eac6e15e9ab248b8a48eabed3f5e3767 Mon Sep 17 00:00:00 2001 From: Felipe Monteiro Date: Fri, 5 Oct 2018 18:12:41 +0100 Subject: [PATCH] [Gate Fix] Fix failing functional/integration tests This patch set pins oslo.messaging to the last stable version to fix the gate [0]. 9.0.0 is incompatible with current requirements. [0] https://pypi.org/project/oslo.messaging/#history Change-Id: I6cf3e9f33ac3efcbf48675273899af38fef86e91 --- etc/deckhand/deckhand.conf.sample | 25 ++++++++++++++++++++++++- requirements.txt | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/etc/deckhand/deckhand.conf.sample b/etc/deckhand/deckhand.conf.sample index fe8a4a96..aac2dc80 100644 --- a/etc/deckhand/deckhand.conf.sample +++ b/etc/deckhand/deckhand.conf.sample @@ -125,7 +125,6 @@ [barbican] -# # Barbican options for allowing Deckhand to communicate with Barbican. # @@ -135,6 +134,18 @@ # URL override for the Barbican API endpoint. (string value) #api_endpoint = http://barbican.example.org:9311/ +# Maximum number of threads used to call secret storage service concurrently. +# (integer value) +#max_workers = 10 + +# Whether to enable Barbican secret caching. Useful for testing to avoid cross- +# test caching conflicts. (boolean value) +#enable_cache = true + +# How long (in seconds) Barbican secret reference/payload lookup results should +# remain cached in memory. (string value) +#cache_timeout = 3600 + # PEM encoded Certificate Authority to use when verifying HTTPs connections. # (string value) #cafile = @@ -380,6 +391,18 @@ #disable_by_file_paths = +[jsonpath] +# JSONPath options for allowing JSONPath logic to be configured. + +# +# From deckhand.conf +# + +# How long (in seconds) JSONPath lookup results should remain cached in memory. +# (integer value) +#cache_timeout = 3600 + + [keystone_authtoken] # diff --git a/requirements.txt b/requirements.txt index 0833a3ed..5f871399 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,7 +31,7 @@ oslo.cache>=1.30.1 # Apache-2.0 oslo.concurrency>=3.27.0 # Apache-2.0 oslo.config!=4.3.0,!=4.4.0 # Apache-2.0 oslo.context>=2.20.0 # Apache-2.0 -oslo.messaging!=5.25.0,>=6.2.0 # Apache-2.0 +oslo.messaging==8.1.2 oslo.db>=4.38.0 # Apache-2.0 oslo.i18n!=3.15.2,>=3.20.0 # Apache-2.0 oslo.log>=3.38.1 # Apache-2.0