Author: buildbot
Date: Mon Dec 10 20:35:39 2012
New Revision: 841518
Log:
Staging update by buildbot for vcl
Modified:
websites/staging/vcl/trunk/content/ (props changed)
websites/staging/vcl/trunk/content/docs/vmwareconfiguration.html
Propchange: websites/staging/vcl/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 10 20:35:39 2012
@@ -1 +1 @@
-1419726
+1419737
Modified: websites/staging/vcl/trunk/content/docs/vmwareconfiguration.html
==============================================================================
--- websites/staging/vcl/trunk/content/docs/vmwareconfiguration.html (original)
+++ websites/staging/vcl/trunk/content/docs/vmwareconfiguration.html Mon Dec 10
20:35:39 2012
@@ -170,7 +170,7 @@
</li>
<li>
<p>Log into the ESX host via SSH (password authentication should work) and
create the directory:</p>
-<div class="codehilite"><pre> <span class="n">ssh</span> <span
class="o"><</span><span class="n">ESXi</span> <span
class="n">host</span><span class="o">></span> <span class="s">'mkdir
/.ssh'</span>
+<div class="codehilite"><pre><span class="n">ssh</span> <span
class="o"><</span><span class="n">ESXi</span> <span
class="n">host</span><span class="o">></span> <span class="s">'mkdir
/.ssh'</span>
</pre></div>
@@ -180,34 +180,30 @@
<ul>
<li>
<p>ESXi 4.x:</p>
-<div class="codehilite"><pre><span class="n">scp</span> <span
class="sr">/etc/</span><span class="n">vcl</span><span class="sr">/vcl.key.pub
<ESXi host>:/</span><span class="o">.</span><span
class="n">ssh</span><span class="o">/</span><span
class="n">authorized_keys</span>
-</pre></div>
-
-
+<p>:::BashLexer
+scp /etc/vcl/vcl.key.pub <ESXi host>:/.ssh/authorized_keys</p>
</li>
<li>
<p>ESXi 5.x:</p>
-<div class="codehilite"><pre><span class="n">scp</span> <span
class="sr">/etc/</span><span class="n">vcl</span><span class="sr">/vcl.key.pub
<ESXi host>:/</span><span class="n">etc</span><span
class="sr">/ssh/</span><span class="nb">keys</span><span
class="o">-</span><span class="n">root</span><span class="o">/</span><span
class="n">authorized_keys</span>
-</pre></div>
-
-
+<p>:::BashLexer
+scp /etc/vcl/vcl.key.pub <ESXi host>:/etc/ssh/keys-root/authorized_keys</p>
</li>
</ul>
</li>
<li>
<p>Test making an SSH connection using the key:</p>
-<div class="codehilite"><pre> <span class="n">ssh</span> <span
class="o">-</span><span class="n">i</span> <span class="sr">/etc/</span><span
class="n">vcl</span><span class="o">/</span><span class="n">vcl</span><span
class="o">.</span><span class="n">key</span> <span class="o"><</span><span
class="n">ESXi</span> <span class="n">host</span><span class="o">></span>
+<div class="codehilite"><pre><span class="n">ssh</span> <span
class="o">-</span><span class="n">i</span> <span class="sr">/etc/</span><span
class="n">vcl</span><span class="o">/</span><span class="n">vcl</span><span
class="o">.</span><span class="n">key</span> <span class="o"><</span><span
class="n">ESXi</span> <span class="n">host</span><span class="o">></span>
</pre></div>
</li>
</ul>
-<p>IMPORTANT: Under ESXi 4.x, the authorized_keys file is erased when the ESXi
VM host is rebooted. Complete the following steps to make the authorized_keys
file persistent:</p>
+<p><strong>IMPORTANT</strong>: Under ESXi 4.x, the authorized_keys file is
erased when the ESXi VM host is rebooted. Complete the following steps to make
the authorized_keys file persistent:</p>
<p><em>Note</em>: VCL will perform these steps automatically when the 1st
reservation assigned to the host is processed.</p>
<ul>
<li>
<p>Create a compressed tarball file containing the /.ssh directory:</p>
-<div class="codehilite"><pre> <span class="n">tar</span> <span
class="o">-</span><span class="n">C</span> <span class="sr">/ -czf
bootbank/</span><span class="n">vcl</span><span class="o">.</span><span
class="n">tgz</span> <span class="o">.</span><span class="n">ssh</span>
+<div class="codehilite"><pre><span class="n">tar</span> <span
class="o">-</span><span class="n">C</span> <span class="sr">/ -czf
bootbank/</span><span class="n">vcl</span><span class="o">.</span><span
class="n">tgz</span> <span class="o">.</span><span class="n">ssh</span>
</pre></div>
@@ -222,9 +218,9 @@ build=4.1.0-260247
updated=2
bootstate=0
</pre></p>
-<div class="codehilite"><pre> <span class="n">Optionally</span> <span
class="n">you</span> <span class="n">can</span> <span class="n">run</span>
<span class="n">the</span> <span class="n">following</span> <span
class="n">two</span> <span class="n">commands:</span>
- <span class="n">tar</span> <span class="o">-</span><span
class="n">C</span> <span class="o">/</span> <span class="o">-</span><span
class="n">czf</span> <span class="n">vcl</span><span class="o">.</span><span
class="n">tgz</span> <span class="o">.</span><span class="n">ssh</span>
- <span class="n">BootModuleConfig</span><span class="o">.</span><span
class="n">sh</span> <span class="o">--</span><span class="n">add</span><span
class="o">=</span><span class="n">vcl</span><span class="o">.</span><span
class="n">tgz</span> <span class="o">--</span><span class="n">verbose</span>
+<div class="codehilite"><pre><span class="n">Optionally</span> <span
class="n">you</span> <span class="n">can</span> <span class="n">run</span>
<span class="n">the</span> <span class="n">following</span> <span
class="n">two</span> <span class="n">commands:</span>
+<span class="n">tar</span> <span class="o">-</span><span class="n">C</span>
<span class="o">/</span> <span class="o">-</span><span class="n">czf</span>
<span class="n">vcl</span><span class="o">.</span><span class="n">tgz</span>
<span class="o">.</span><span class="n">ssh</span>
+<span class="n">BootModuleConfig</span><span class="o">.</span><span
class="n">sh</span> <span class="o">--</span><span class="n">add</span><span
class="o">=</span><span class="n">vcl</span><span class="o">.</span><span
class="n">tgz</span> <span class="o">--</span><span class="n">verbose</span>
</pre></div>
@@ -255,11 +251,10 @@ bootstate=0
<li>This account is used to manage the VM host and VMs assigned to the
host</li>
<li>The username and password are currently only used if the vSphere SDK is
used to manage the VM host and VMs</li>
</ul>
-<h4 id="storage-parameters">Storage Parameters</h4>
-<p>Resource Path (optional)
-Resource Path only needs to be configured if VMware vCenter is used. It
defines the location where VMs will be created in the vCenter inventory tree.
The inventory tree contains at least one Datacenter, and may also contain
Folders, Clusters, and Resource Pools.
+<h3 id="storage-parameters">Storage Parameters</h3>
+<h4 id="resource-path-optional">Resource Path (optional)</h4>
+<p>Resource Path only needs to be configured if VMware vCenter is used. It
defines the location where VMs will be created in the vCenter inventory tree.
The inventory tree contains at least one Datacenter, and may also contain
Folders, Clusters, and Resource Pools.
Example: /DatacenterA/Folder1/Cluster2/ResourcePool3</p>
-<h4 id="repository-path-optional">Repository Path (optional)</h4>
<ul>
<li>Path where master copies of images are stored which are used to transfer
images to VM host datastores or to other repositories:</li>
<li>If a reservation is assigned to a host but the image does not exist in
that host's datastore, it is copied from the repository to the virtual disk
path when the VM is loaded</li>
@@ -320,10 +315,12 @@ Example: /DatacenterA/Folder1/Cluster2/R
<li>The VM host's Virtual Disk Path is located on network storage which is
shared by other VM hosts</li>
<li>Repository Path is optional</li>
</ul>
-<p>The Virtual Disk Mode (VM Disk) parameter does not determine whether or not:
-...images are copied from the datastore to the repository during image capture
-...images are copied from the repository to the datastore during image load
-These are determined by whether or not Repository Path is configured in the
profile</p>
+<p><div class="docnote">
+ The Virtual Disk Mode (VM Disk) parameter does not determine whether or
not:
+ ...images are copied from the datastore to the repository during image
capture
+ ...images are copied from the repository to the datastore during image load
+ These are determined by whether or not Repository Path is configured in
the profile
+ </div></p>
</li>
</ul>
<h4 id="vm-working-directory-path-optional-previously-vm-path">VM Working
Directory Path (optional) (previously VM Path)</h4>
