aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry-puppet.j2.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-13 11:41:20 +0000
committerGerrit Code Review <review@openstack.org>2016-10-13 11:41:20 +0000
commita3f9cf1314ae2d29ba68c012069dcc2b2431aa05 (patch)
tree0393d112c2ffc8ce70a621944a3475f38cd6ecf9 /overcloud-resource-registry-puppet.j2.yaml
parent3c438851e73489e03e7fd0e54ce700f5c8953ce3 (diff)
parent9bf37e06b53a1f621eb4fee314a57d2d4a17c644 (diff)
Merge "Add HAProxy TLS handled by certmonger as composable service"
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 65cc9e33..c7f15105 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -142,6 +142,8 @@ resource_registry:
OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None
OS::TripleO::Services::RabbitMQ: puppet/services/rabbitmq.yaml
OS::TripleO::Services::HAproxy: puppet/services/haproxy.yaml
+ OS::TripleO::Services::HAProxyPublicTLS: OS::Heat::None
+ OS::TripleO::Services::HAProxyInternalTLS: OS::Heat::None
OS::TripleO::Services::Keepalived: puppet/services/keepalived.yaml
OS::TripleO::Services::Memcached: puppet/services/memcached.yaml
OS::TripleO::Services::SaharaApi: OS::Heat::None