airship/deckhand
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2018-10-05 21:17:39 +00:00 committed by Gerrit Code Review
commit f9e4b5993f
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
etc/deckhand/deckhand.conf.sample
View File

@ -125,7 +125,6 @@
[barbican] [barbican]
#
# Barbican options for allowing Deckhand to communicate with Barbican. # Barbican options for allowing Deckhand to communicate with Barbican.
# #
@ -135,6 +134,18 @@
# URL override for the Barbican API endpoint. (string value) # URL override for the Barbican API endpoint. (string value)
#api_endpoint = http://barbican.example.org:9311/ #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. # PEM encoded Certificate Authority to use when verifying HTTPs connections.
# (string value) # (string value)
#cafile = <None> #cafile = <None>
@ -380,6 +391,18 @@
#disable_by_file_paths = #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] [keystone_authtoken]
# #

2
requirements.txt
View File

@ -31,7 +31,7 @@ oslo.cache>=1.30.1 # Apache-2.0
oslo.concurrency>=3.27.0 # Apache-2.0 oslo.concurrency>=3.27.0 # Apache-2.0
oslo.config!=4.3.0,!=4.4.0 # Apache-2.0 oslo.config!=4.3.0,!=4.4.0 # Apache-2.0
oslo.context>=2.20.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.db>=4.38.0 # Apache-2.0
oslo.i18n!=3.15.2,>=3.20.0 # Apache-2.0 oslo.i18n!=3.15.2,>=3.20.0 # Apache-2.0
oslo.log>=3.38.1 # Apache-2.0 oslo.log>=3.38.1 # Apache-2.0