From 57dfd9573fcecfdf3d6166153020bd27843f3c0b Mon Sep 17 00:00:00 2001
From: Stan Lagun <slagun@mirantis.com>
Date: Fri, 20 Sep 2013 13:39:32 +0400
Subject: [PATCH] Cherry-pick from release-0.2

Changed default config values to match RabbitMQ defaults

Change-Id: Ia12e6ea09c4499a3d608dc611a2c1dd52aca6311
---
 doc/source/index.rst | 13 ++++++++++---
 etc/murano-api.conf  | 21 +++++++++------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/doc/source/index.rst b/doc/source/index.rst
index 78717f7a0..23a870a40 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -72,9 +72,16 @@ Configure
     [rabbitmq]
     host = localhost
     port = 5672
-    virtual_host = murano
-    login = murano
-    password = murano
+
+    # RabbitMQ credentials. Fresh RabbitMQ installation has "guest" account with "guest" password.
+    # It is recommended to create dedicated user account for Murano using RabbitMQ web console or command line utility
+    login = guest
+    password = guest
+
+    # RabbitMQ virtual host (vhost). Fresh RabbitMQ installation has "/" vhost preconfigured.
+    # It is recommended to create dedicated vhost for Murano using RabbitMQ web console or command line utility
+    virtual_host = /
+
     ssl = False
     ca_certs =
 
diff --git a/etc/murano-api.conf b/etc/murano-api.conf
index 85e9c351e..29c8393a1 100644
--- a/etc/murano-api.conf
+++ b/etc/murano-api.conf
@@ -38,24 +38,21 @@ host = localhost
 # RabbitMQ port (5672 is a default)
 port = 5672
 
+# RabbitMQ credentials. Fresh RabbitMQ installation has "guest" account with "guest" password.
+# It is recommended to create dedicated user account for Murano using RabbitMQ web console or command line utility
+login = guest
+password = guest
+
+# RabbitMQ virtual host (vhost). Fresh RabbitMQ installation has "/" vhost preconfigured.
+# It is recommended to create dedicated vhost for Murano using RabbitMQ web console or command line utility
+virtual_host = /
+
 # Use SSL for RabbitMQ connections (True or False)
 ssl = False
 
 # Path to SSL CA certificate or empty to allow self signed server certificate
 ca_certs =
 
-# RabbitMQ credentials. Fresh RabbitMQ installation has "guest" account with "guest" password
-# It's assumed here that default credentials were changed in accordance with this config.
-# You can use rabbitmqctl add_user ... command for that.
-# It is recommended to change default credentials for Murano using RabbitMQ web console or command line utility.
-login = muranouser
-password = murano
-
-# RabbitMQ virtual host (vhost). Fresh RabbitMQ installation has "/" vhost preconfigured.
-# It's assumed here that default vhost was changed in accordance with this config.
-# You can use rabbitmqctl add_vhost ... command for that.
-virtual_host = muranovhost
-
 [ssl]
 #Parameters to configure SSL for trusted HTTPS connection