From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Thu, 23 Feb 2017 14:02:16 +0000 (+0200)
Subject: Enable TLS for swift-proxy's ceilometer notifications
X-Git-Tag: opnfv-6.0.0~1014^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e8df83570ea64244a26174376afe550a383490f2;p=apex-tripleo-heat-templates.git

Enable TLS for swift-proxy's ceilometer notifications

If the message broker is using TLS, we enable it for these
notifications.

Change-Id: I4f37e77ae12e9582fab7d326ebd4c70127c5445f
Depends-On: If23d1f0d20264faaddc2e5ad54863483fa43ed41
---

diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml
index 526fa888..c941b598 100644
--- a/puppet/services/swift-proxy.yaml
+++ b/puppet/services/swift-proxy.yaml
@@ -138,6 +138,7 @@ outputs:
                     - ''
                   - 'proxy-logging'
                   - 'proxy-server'
+            swift::proxy::ceilometer::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
             swift::proxy::account_autocreate: true
             # NOTE: bind IP is found in Heat replacing the network name with the
             # local node IP for the given network; replacement examples