diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-01-24 17:46:53 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-01-24 17:46:53 +0000 |
commit | 4e76833b37418be44a1a4ada689151d824207116 (patch) | |
tree | e912a348143cf19558c9f03f309046dd50c21649 /manifests/haproxy.pp | |
parent | 7295a40c95d49e4b204ad0772495ad3c0644aede (diff) | |
parent | 5318a833227ee09eccee520542f7235311675403 (diff) |
Merge "Use TLS proxy for Glance API's internal TLS"
Diffstat (limited to 'manifests/haproxy.pp')
-rw-r--r-- | manifests/haproxy.pp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 4bbe1d6..1c3daac 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -930,6 +930,7 @@ class tripleo::haproxy ( 'set-header X-Forwarded-Proto http if !{ ssl_fc }'], }, service_network => $glance_api_network, + member_options => union($haproxy_member_options, $internal_tls_member_options), } } |