aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2017-06-28 15:47:20 -0400
committerRob Crittenden <rcritten@redhat.com>2017-06-28 15:50:40 -0400
commit90eed9d6a01000377eeadddb07a9e8d57163fe17 (patch)
tree8b28c17c73a5bb84689d3b0be142d152825f9fef /manifests
parent669f0dfe04f36837f5350bdb387f85e5d49521c0 (diff)
Merge the nova HAproxy TLS options
This makes sure that we set the necessary options so HAProxy uses TLS to contact nova. It was commented out when nova was moved to not run over httpd. Since that is no longer the case we can re-enable it. Change-Id: I026a7dab30b00a4e93966f650f098c570b0b624b Depends-On: Iac35b7ddcd8a800901548c75ca8d5083ad17e4d3
Diffstat (limited to 'manifests')
-rw-r--r--manifests/haproxy.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 2f29674..e12ae77 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -1048,7 +1048,7 @@ class tripleo::haproxy (
mode => 'http',
public_ssl_port => $ports[nova_api_ssl_port],
service_network => $nova_osapi_network,
- #member_options => union($haproxy_member_options, $internal_tls_member_options),
+ member_options => union($haproxy_member_options, $internal_tls_member_options),
}
}