From a8752a9f855d334f81889dd38a5c307873f9c03d Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@hp.com>
Date: Wed, 9 Apr 2014 15:11:25 +0100
Subject: [PATCH] RabbitMQ - Correct rabbit.users metadata sample

Additionally, we remove the no longer used heat_users template

Change-Id: Ib26cca827b72642e0884072b31c6caf96e29160b
---
 elements/rabbitmq-server/README.md                       | 9 +++++++--
 .../os-config-applier/etc/rabbitmq/heat_users            | 3 ---
 2 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 elements/rabbitmq-server/os-config-applier/etc/rabbitmq/heat_users

diff --git a/elements/rabbitmq-server/README.md b/elements/rabbitmq-server/README.md
index 57e9e06c3..5202997d4 100644
--- a/elements/rabbitmq-server/README.md
+++ b/elements/rabbitmq-server/README.md
@@ -11,8 +11,13 @@ this in Heat:
     Metadata:
       rabbit:
         users:
-          - username: guest
-          - tags: administrator
+          guest:
+            username: guest
+            tags: administrator
+          nova:
+            username: nova
+            password: SuperSecret
+            tags: administrator
         password_handle: {Ref: RabbitMQPasswordHandle}
 
 Using cfn-signal, we will feed back a generated password into the handle
diff --git a/elements/rabbitmq-server/os-config-applier/etc/rabbitmq/heat_users b/elements/rabbitmq-server/os-config-applier/etc/rabbitmq/heat_users
deleted file mode 100644
index 835c220e6..000000000
--- a/elements/rabbitmq-server/os-config-applier/etc/rabbitmq/heat_users
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#rabbit.users}}
-{{username}} {{tags}}
-{{/rabbit.users}}