You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tashi-commits@incubator.apache.org by st...@apache.org on 2010/07/06 00:52:31 UTC

svn commit: r960739 - in /incubator/tashi/site/docs: documentation-options.html documentation-single.html

Author: stroucki
Date: Tue Jul  6 00:52:31 2010
New Revision: 960739

URL: http://svn.apache.org/viewvc?rev=960739&view=rev
Log:
remake documentation

Modified:
    incubator/tashi/site/docs/documentation-options.html
    incubator/tashi/site/docs/documentation-single.html

Modified: incubator/tashi/site/docs/documentation-options.html
URL: http://svn.apache.org/viewvc/incubator/tashi/site/docs/documentation-options.html?rev=960739&r1=960738&r2=960739&view=diff
==============================================================================
--- incubator/tashi/site/docs/documentation-options.html (original)
+++ incubator/tashi/site/docs/documentation-options.html Tue Jul  6 00:52:31 2010
@@ -437,6 +437,16 @@ table.options td {
 <td>If the VmType is "kernel", this is the initrd to load for use in the guest</td>
 </tr>
 <tr>
+<td>defaultDiskType</td>
+<td>qcow</td>
+<td>Default disk image format, e.g. qcow, vhd</td>
+</tr>
+<tr>
+<td>defaultBridgeFormat</td>
+<td>br%s</td>
+<td>Format string to combine with a network ID to obtain a bridge name</td>
+</tr>
+<tr>
 <td colspan="3">
 <center>
 [Vfs]

Modified: incubator/tashi/site/docs/documentation-single.html
URL: http://svn.apache.org/viewvc/incubator/tashi/site/docs/documentation-single.html?rev=960739&r1=960738&r2=960739&view=diff
==============================================================================
--- incubator/tashi/site/docs/documentation-single.html (original)
+++ incubator/tashi/site/docs/documentation-single.html Tue Jul  6 00:52:31 2010
@@ -153,7 +153,15 @@ In [3]: data.baseDataObject.save()
 
 In [4]:
 </pre></div>
-                                                                                                <p>If you were using MySQL (or sqlite), you'd have to populate a row in the database with columns named "id", "name", "state", and "up".</p>
+                                                                                                <p>If you were using MySQL (or sqlite), you'd have to populate the
+relevant tables in the database.</p>
+                                                                                                <div class="lit"><pre>
+clustermanager:/opt/tashi/bin# sqlite3 /var/tmp/cm_sqlite.dat
+SQLite version 3.5.9
+Enter ".help" for instructions
+sqlite&gt; insert into networks values (272, 'default');
+sqlite&gt; insert into hosts (name) values ('firsthost');
+</pre></div>
                                                                                                 <p>Then you may either create a host lock or quit the CM and restart it to force the creation of host locks.</p>
                                                                                                 <div class="lit"><pre>
 In [4]: import threading
@@ -184,8 +192,8 @@ mryan3@firsthost:~/scratch/tashi$ ./bin/
                                                                                                 <h3>VM deployment (XEN)</h3>
                                                                                                 <p>Have your networking environment set up, so that the virtual machines
 may be attached to the proper virtual bridges.</p>
-                                                                                                <p>Virtual disks are attached using <pre>blktap</pre>, so make sure that
-the proper blktap module is loaded, and <pre>blktapctrl</pre> is running
+                                                                                                <p>In Xen 3, virtual disks are attached using <tt>blktap</tt>, so make sure that
+the proper blktap module is loaded, and <tt>blktapctrl</tt> is running
 properly.</p>
                                                                                                 <p>Place a disk image in /dfs (or wherever you configured it to be).</p>
                                                                                                 <p>Have tashi-client start up a new virtual machine.</p>