From 4b39b19d1955c503ee0fdff7d2b519d4ec3be2d1 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Thu, 17 May 2018 09:38:52 +0300
Subject: [PATCH] Use rabbitmq service principal in metadata settings

We don't request a certificate for oslo_messaging_rpc, so we use
rabbitmq (the one we used to use) instead.

Closes-Bug: #1771744
Change-Id: I05ef290215fa0303b3be6ddb4462e7ca02b2d71b
---
 puppet/services/messaging/notify-rabbitmq.yaml | 2 +-
 puppet/services/messaging/rpc-rabbitmq.yaml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/puppet/services/messaging/notify-rabbitmq.yaml b/puppet/services/messaging/notify-rabbitmq.yaml
index 360b8c8104..39c9ac8663 100644
--- a/puppet/services/messaging/notify-rabbitmq.yaml
+++ b/puppet/services/messaging/notify-rabbitmq.yaml
@@ -139,7 +139,7 @@ outputs:
         if:
           - internal_tls_enabled
           -
-            - service: oslo_messaging_notify
+            - service: rabbitmq
               network: {get_param: [ServiceNetMap, OsloMessagingNotifyNetwork]}
               type: node
           - null
diff --git a/puppet/services/messaging/rpc-rabbitmq.yaml b/puppet/services/messaging/rpc-rabbitmq.yaml
index f726db5282..093aae56d7 100644
--- a/puppet/services/messaging/rpc-rabbitmq.yaml
+++ b/puppet/services/messaging/rpc-rabbitmq.yaml
@@ -140,7 +140,7 @@ outputs:
         if:
           - internal_tls_enabled
           -
-            - service: oslo_messaging_rpc
+            - service: rabbitmq
               network: {get_param: [ServiceNetMap, OsloMessagingRpcNetwork]}
               type: node
           - null