From e79c20fb78ab66e1f7e63bba10b11a66d19ecbc7 Mon Sep 17 00:00:00 2001
From: Serg Melikyan <smelikyan@mirantis.com>
Date: Fri, 14 Jun 2013 13:30:54 +0400
Subject: [PATCH] Resolved issues with configuration file

Change-Id: I08c8addb8f3c3b40cfdc80f0529e3e6b6eae7fff
---
 etc/murano-api-paste.ini |  2 ++
 etc/murano-api.conf      | 21 ++++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/etc/murano-api-paste.ini b/etc/murano-api-paste.ini
index f8f3c6d7d..dc839b19b 100644
--- a/etc/murano-api-paste.ini
+++ b/etc/murano-api-paste.ini
@@ -7,6 +7,8 @@ paste.app_factory = muranoapi.api.v1.router:API.factory
 [filter:context]
 paste.filter_factory = muranoapi.api.middleware.context:ContextMiddleware.factory
 
+#For more information see Auth-Token Middleware with Username and Password
+#http://docs.openstack.org/developer/keystone/configuringservices.html
 [filter:authtoken]
 paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
 auth_host = localhost
diff --git a/etc/murano-api.conf b/etc/murano-api.conf
index f03df65bd..c573dc10e 100644
--- a/etc/murano-api.conf
+++ b/etc/murano-api.conf
@@ -11,8 +11,7 @@ bind_host = 0.0.0.0
 # Port the bind the server to
 bind_port = 8082
 
-# Log to this file. Make sure the user running skeleton-api has
-# permissions to write to this file!
+# Log to this file. Make sure the user has permissions to write to this file!
 log_file = /tmp/murano-api.log
 
 #A valid SQLAlchemy connection string for the metadata database
@@ -22,14 +21,26 @@ sql_connection = sqlite:///murano.sqlite
 db_auto_create = True
 
 [reports]
+#Change this params only when you know what you are doing
 results_exchange = task-results
 results_queue = task-results
 reports_exchange = task-reports
 reports_queue = task-reports
 
 [rabbitmq]
+# Connection parameters to RabbitMQ service
+
+# Hostname or IP address where RabbitMQ is located.
 host = localhost
+
+# RabbitMQ port (5672 is a default)
 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 = /
\ No newline at end of file