summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-09 22:56:55 +0000
committerGerrit Code Review <review@openstack.org>2017-03-09 22:56:55 +0000
commit78b7a7ed8a6b9af70f300d98f1c7f1c4eb715629 (patch)
treeaf7b3f26d932b589a1f742680f1bc644847f33b6 /environments
parenta8d511a05e2f94af177155546bcc5b74ee0329a0 (diff)
parent1992282b88beed0df0a25e54b4bd92bbc3b1919f (diff)
Merge "Pass hieradata for internal TLS for RabbitMQ"
Diffstat (limited to 'environments')
-rw-r--r--environments/enable-internal-tls.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/environments/enable-internal-tls.yaml b/environments/enable-internal-tls.yaml
index ff4ecfbe..f485e4a5 100644
--- a/environments/enable-internal-tls.yaml
+++ b/environments/enable-internal-tls.yaml
@@ -2,6 +2,7 @@
# a TLS for in the internal network via certmonger
parameter_defaults:
EnableInternalTLS: true
+ RabbitClientUseSSL: true
# Required for novajoin to enroll the overcloud nodes
ServerMetadata:
@@ -11,6 +12,8 @@ resource_registry:
OS::TripleO::Services::HAProxyInternalTLS: ../puppet/services/haproxy-internal-tls-certmonger.yaml
OS::TripleO::Services::ApacheTLS: ../puppet/services/apache-internal-tls-certmonger.yaml
OS::TripleO::Services::MySQLTLS: ../puppet/services/database/mysql-internal-tls-certmonger.yaml
+ OS::TripleO::Services::RabbitMQTLS: ../puppet/services/rabbitmq-internal-tls-certmonger.yaml
+
# We use apache as a TLS proxy
OS::TripleO::Services::TLSProxyBase: ../puppet/services/apache.yaml