diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-15 18:25:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-15 18:25:02 +0000 |
| commit | f79b6b479a8993b7bf51639f10d2c9288d36e33e (patch) | |
| tree | 71217002c58597f5c98ade934a9a3b141a6da053 | |
| parent | 2f0dcc43b953709ff201ab0386a2178eb01df16f (diff) | |
| parent | 23ca447f770f35af28b8ba641becb0040023fb87 (diff) | |
Merge "Enable internal TLS for Barbican API"
| -rw-r--r-- | puppet/services/barbican-api.yaml | 5 |
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: |