summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-17 16:08:20 +0000
committerGerrit Code Review <review@openstack.org>2017-08-17 16:08:20 +0000
commitf5a0c6ee564da043ebbbb7096e67c170b828f190 (patch)
tree9aedacb26503e01bf60f5e3165b4273e3e732dc6 /environments
parent1bd5492a41bba96261b3da74c56cc4cca69eee09 (diff)
parent1b119110c052805eaf30be26df5fb30809eb49e0 (diff)
Merge "Enable TLS for containerized haproxy"
Diffstat (limited to 'environments')
-rw-r--r--environments/docker-services-tls-everywhere.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/environments/docker-services-tls-everywhere.yaml b/environments/docker-services-tls-everywhere.yaml
index 49d02e6f..e227366c 100644
--- a/environments/docker-services-tls-everywhere.yaml
+++ b/environments/docker-services-tls-everywhere.yaml
@@ -41,3 +41,4 @@ resource_registry:
OS::TripleO::Services::SwiftProxy: ../docker/services/swift-proxy.yaml
OS::TripleO::Services::SwiftRingBuilder: ../docker/services/swift-ringbuilder.yaml
OS::TripleO::Services::SwiftStorage: ../docker/services/swift-storage.yaml
+ OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml