summaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry-puppet.j2.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-28 11:01:52 +0000
committerGerrit Code Review <review@openstack.org>2017-03-28 11:01:52 +0000
commita32d101af96a9cee5f07977894de2d496a5b5a70 (patch)
tree4349f9caa9cf955467502fe4ef58f1a5125dfc5c /overcloud-resource-registry-puppet.j2.yaml
parent85cf5d0e98711e13a148162e071a756ddfb737e1 (diff)
parent69c213e3e3e9ba6635cbda055ec1542ac0b53d30 (diff)
Merge "Rabbitmq: Use conditional instead of nested stack for TLS-specific bits"
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index d9eaf8df..5debed5c 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -170,7 +170,6 @@ resource_registry:
OS::TripleO::Services::PacemakerRemote: OS::Heat::None
OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None
OS::TripleO::Services::RabbitMQ: puppet/services/rabbitmq.yaml
- OS::TripleO::Services::RabbitMQTLS: OS::Heat::None
OS::TripleO::Services::HAproxy: puppet/services/haproxy.yaml
OS::TripleO::Services::HAProxyPublicTLS: OS::Heat::None
OS::TripleO::Services::HAProxyInternalTLS: OS::Heat::None