Merge "[Gate Fix] Fix failing functional/integration tests"

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 = <None>
@@ -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]
 
 #

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