aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-28 15:46:58 +0000
committerGerrit Code Review <review@openstack.org>2017-07-28 15:46:58 +0000
commit9e74d2d0acdc44e90c3be7a907d194d6102a830c (patch)
tree83d112d20efc5a5c1f51fec4595e1549c15116e4 /puppet/services
parent19e89d8d6e2c39c4b98edfba33613607e28e38ee (diff)
parent03af5f8f4d01fe40253b355252e05548d5f50777 (diff)
Merge "Enable Zaqar API SSL"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/zaqar.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/services/zaqar.yaml b/puppet/services/zaqar.yaml
index 21857423..4a1ad179 100644
--- a/puppet/services/zaqar.yaml
+++ b/puppet/services/zaqar.yaml
@@ -105,7 +105,7 @@ outputs:
- {get_param: ZaqarDebug }
zaqar::server::service_name: 'httpd'
zaqar::transport::websocket::bind: {get_param: [EndpointMap, ZaqarInternal, host]}
- zaqar::wsgi::apache::ssl: false
+ zaqar::wsgi::apache::ssl: {get_param: EnableInternalTLS}
zaqar::wsgi::apache::bind_host: {get_param: [ServiceNetMap, ZaqarApiNetwork]}
zaqar::message_pipeline: 'zaqar.notification.notifier'
zaqar::unreliable: true
@@ -178,6 +178,8 @@ outputs:
- {}
step_config: |
include ::tripleo::profile::base::zaqar
+ metadata_settings:
+ get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks:
yaql:
expression: $.data.apache_upgrade + $.data.zaqar_upgrade