From 00e56ce3d13c0b44a2c59639cfde0e12e97f0b38 Mon Sep 17 00:00:00 2001
From: ZhiQiang Fan <zhiqiang.fan@huawei.com>
Date: Fri, 7 Feb 2014 11:59:13 +0800
Subject: [PATCH] Replace mongo shell interaction with script

In the section of 'Install the Telemetry service', we need to create
the database and a ceilometer database user. Currently we use mongo
shell and require user to interact with it. However, we can use
mongo script and do it via single copy and paste.

Change-Id: I6b88f920c9576aabdc190affc807a0f566ee4c5e
---
 doc/install-guide/section_ceilometer-install.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/doc/install-guide/section_ceilometer-install.xml b/doc/install-guide/section_ceilometer-install.xml
index fae27441a1..2499068b01 100644
--- a/doc/install-guide/section_ceilometer-install.xml
+++ b/doc/install-guide/section_ceilometer-install.xml
@@ -91,12 +91,11 @@
     <step>
       <para>Create the database and a <literal>ceilometer</literal>
         database user:</para>
-      <screen><prompt>#</prompt> <userinput>mongo --host <replaceable>controller</replaceable></userinput>
-<prompt>></prompt> <userinput>use ceilometer</userinput>
-<prompt>></prompt> <userinput>db.addUser( { user: "ceilometer",
-              pwd: "<replaceable>CEILOMETER_DBPASS</replaceable>",
-              roles: [ "readWrite", "dbAdmin" ]
-            } )</userinput></screen>
+      <screen><prompt>#</prompt> <userinput>mongo --host <replaceable>controller</replaceable> --eval '
+db = db.getSiblingDB("ceilometer");
+db.addUser({user: "ceilometer",
+            pwd: "<replaceable>CEILOMETER_DBPASS</replaceable>",
+            roles: [ "readWrite", "dbAdmin" ]})'</userinput></screen>
     </step>
     <step>
       <para>Configure the Telemetry service to use the database:</para>