summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-15 18:25:02 +0000
committerGerrit Code Review <review@openstack.org>2016-11-15 18:25:02 +0000
commitf79b6b479a8993b7bf51639f10d2c9288d36e33e (patch)
tree71217002c58597f5c98ade934a9a3b141a6da053 /puppet/services
parent2f0dcc43b953709ff201ab0386a2178eb01df16f (diff)
parent23ca447f770f35af28b8ba641becb0040023fb87 (diff)
Merge "Enable internal TLS for Barbican API"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/barbican-api.yaml5
1 files changed, 4 insertions, 1 deletions
diff --git a/puppet/services/barbican-api.yaml b/puppet/services/barbican-api.yaml
index cf57680c..ab6b0ec7 100644
--- a/puppet/services/barbican-api.yaml
+++ b/puppet/services/barbican-api.yaml
@@ -52,6 +52,9 @@ parameters:
default: guest
description: The username for RabbitMQ
type: string
+ EnableInternalTLS:
+ type: boolean
+ default: false
resources:
@@ -85,7 +88,7 @@ outputs:
barbican::api::rabbit_heartbeat_timeout_threshold: 60
barbican::api::service_name: 'httpd'
barbican::wsgi::apache::bind_host: {get_param: [ServiceNetMap, BarbicanApiNetwork]}
- barbican::wsgi::apache::ssl: false
+ barbican::wsgi::apache::ssl: {get_param: EnableInternalTLS}
barbican::wsgi::apache::workers: {get_param: BarbicanWorkers}
barbican::wsgi::apache::servername:
str_replace: