From 44a64cb3d1c05b9c838e3fce46f537dfcca82225 Mon Sep 17 00:00:00 2001
From: Yolanda Robla Mota <yroblamo@redhat.com>
Date: Thu, 18 Aug 2016 10:53:03 +0200
Subject: [PATCH] Temporarily add rabbit keys to hiera

Rabbit has been changing keys recently, first because the signing
key was compromised, and another time to add better security.
However, puppet module has not been updated since May, and is
not reflecting the proper keys, causing errors when installing
rabbitmq-server.
As a workaround, set the proper keys with hiera until we wait
for a new version of rabbitmq package, to allow us to deploy
infracloud successfully.

Change-Id: I9b449b5633b02d6f43b3f4a085010f5356dfb23e
---
 hiera/group/infracloud.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hiera/group/infracloud.yaml b/hiera/group/infracloud.yaml
index 4fa0d39da2..be70b8f743 100644
--- a/hiera/group/infracloud.yaml
+++ b/hiera/group/infracloud.yaml
@@ -2948,3 +2948,5 @@ ironic_inventory_chocolate:
       rack: b05
       ilo_mac: 00:9c:02:a7:e9:14
     name: compute094.chocolate.ic.openstack.org
+rabbitmq::package_gpg_key: 'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc'
+rabbitmq::repo::apt::key: '0A9AF2115F4687BD29803A206B73A36E6026DFCA'